Revision: 77705
http://sourceforge.net/p/brlcad/code/77705
Author: starseeker
Date: 2020-11-07 02:33:34 +0000 (Sat, 07 Nov 2020)
Log Message:
-----------
remove exppp lib references
Modified Paths:
--------------
brlcad/branches/extbuild/misc/CMake/FindSTEPCODE.cmake
brlcad/branches/extbuild/src/other/ext/CMake/FindSTEPCODE.cmake
brlcad/branches/extbuild/src/other/ext/stepcode.cmake
brlcad/branches/extbuild/src/other/ext/stepcode.dist
Modified: brlcad/branches/extbuild/misc/CMake/FindSTEPCODE.cmake
===================================================================
--- brlcad/branches/extbuild/misc/CMake/FindSTEPCODE.cmake 2020-11-07
02:31:05 UTC (rev 77704)
+++ brlcad/branches/extbuild/misc/CMake/FindSTEPCODE.cmake 2020-11-07
02:33:34 UTC (rev 77705)
@@ -48,7 +48,6 @@
set(STEPCODE_LIBS
express
- exppp
stepcore
stepeditor
stepdai
@@ -74,7 +73,6 @@
# Allow STEPCODE_LIBRARY to be set manually, as the location of the netpbm
library
foreach(search ${_STEPCODE_SEARCHES})
find_library(STEPCODE_EXPRESS_LIBRARY NAMES express NAMES_PER_DIR
${${search}} PATH_SUFFIXES lib)
- find_library(STEPCODE_EXPPP_LIBRARY NAMES exppp NAMES_PER_DIR ${${search}}
PATH_SUFFIXES lib)
find_library(STEPCODE_CORE_LIBRARY NAMES stepcore NAMES_PER_DIR ${${search}}
PATH_SUFFIXES lib)
find_library(STEPCODE_EDITOR_LIBRARY NAMES stepeditor NAMES_PER_DIR
${${search}} PATH_SUFFIXES lib)
find_library(STEPCODE_DAI_LIBRARY NAMES stepdai NAMES_PER_DIR ${${search}}
PATH_SUFFIXES lib)
@@ -92,7 +90,6 @@
find_package_handle_standard_args(STEPCODE DEFAULT_MSG
STEPCODE_INCLUDE_DIR
STEPCODE_EXPRESS_LIBRARY
- STEPCODE_EXPPP_LIBRARY
STEPCODE_CORE_LIBRARY
STEPCODE_EDITOR_LIBRARY
STEPCODE_DAI_LIBRARY
@@ -106,7 +103,6 @@
)
set(STEPCODE_LIBRARIES
${STEPCODE_EXPRESS_LIBRARY}
- ${STEPCODE_EXPPP_LIBRARY}
${STEPCODE_CORE_LIBRARY}
${STEPCODE_EDITOR_LIBRARY}
${STEPCODE_DAI_LIBRARY}
Modified: brlcad/branches/extbuild/src/other/ext/CMake/FindSTEPCODE.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/CMake/FindSTEPCODE.cmake
2020-11-07 02:31:05 UTC (rev 77704)
+++ brlcad/branches/extbuild/src/other/ext/CMake/FindSTEPCODE.cmake
2020-11-07 02:33:34 UTC (rev 77705)
@@ -48,7 +48,6 @@
set(STEPCODE_LIBS
express
- exppp
stepcore
stepeditor
stepdai
@@ -74,7 +73,6 @@
# Allow STEPCODE_LIBRARY to be set manually, as the location of the netpbm
library
foreach(search ${_STEPCODE_SEARCHES})
find_library(STEPCODE_EXPRESS_LIBRARY NAMES express NAMES_PER_DIR
${${search}} PATH_SUFFIXES lib)
- find_library(STEPCODE_EXPPP_LIBRARY NAMES exppp NAMES_PER_DIR ${${search}}
PATH_SUFFIXES lib)
find_library(STEPCODE_CORE_LIBRARY NAMES stepcore NAMES_PER_DIR ${${search}}
PATH_SUFFIXES lib)
find_library(STEPCODE_EDITOR_LIBRARY NAMES stepeditor NAMES_PER_DIR
${${search}} PATH_SUFFIXES lib)
find_library(STEPCODE_DAI_LIBRARY NAMES stepdai NAMES_PER_DIR ${${search}}
PATH_SUFFIXES lib)
@@ -92,7 +90,6 @@
find_package_handle_standard_args(STEPCODE DEFAULT_MSG
STEPCODE_INCLUDE_DIR
STEPCODE_EXPRESS_LIBRARY
- STEPCODE_EXPPP_LIBRARY
STEPCODE_CORE_LIBRARY
STEPCODE_EDITOR_LIBRARY
STEPCODE_DAI_LIBRARY
@@ -106,7 +103,6 @@
)
set(STEPCODE_LIBRARIES
${STEPCODE_EXPRESS_LIBRARY}
- ${STEPCODE_EXPPP_LIBRARY}
${STEPCODE_CORE_LIBRARY}
${STEPCODE_EDITOR_LIBRARY}
${STEPCODE_DAI_LIBRARY}
Modified: brlcad/branches/extbuild/src/other/ext/stepcode.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode.cmake 2020-11-07
02:31:05 UTC (rev 77704)
+++ brlcad/branches/extbuild/src/other/ext/stepcode.cmake 2020-11-07
02:33:34 UTC (rev 77705)
@@ -54,7 +54,7 @@
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/STEPCODE_BLD-prefix")
# Tell the parent build about files and libraries
- set(STEPCODE_LIBS express exppp stepcore stepeditor stepdai steputils)
+ set(STEPCODE_LIBS express stepcore stepeditor stepdai steputils)
foreach(SCLIB ${STEPCODE_LIBS})
set(SYMLINK_1 ${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX})
if (APPLE)
@@ -127,7 +127,6 @@
utils/gennodearray.h
utils/gennodelist.h
utils/sc_hash.h
- exppp/exppp.h
express/alg.h
express/basic.h
express/caseitem.h
@@ -138,6 +137,7 @@
express/entity.h
express/error.h
express/expbasic.h
+ express/exppp.h
express/expr.h
express/express.h
express/hash.h
@@ -168,7 +168,6 @@
set(STEPCODE_INCLUDE_DIRS ${STEPCODE_INCLUDE_DIR} CACHE STRING "Directories
containing STEPCODE headers." FORCE)
set(STEPCODE_EXPRESS_LIBRARY express CACHE STRING "Building bundled
STEPCODE" FORCE)
- set(STEPCODE_EXPPP_LIBRARY exppp CACHE STRING "Building bundled STEPCODE"
FORCE)
set(STEPCODE_CORE_LIBRARY stepcore CACHE STRING "Building bundled STEPCODE"
FORCE)
set(STEPCODE_EDITOR_LIBRARY stepeditor CACHE STRING "Building bundled
STEPCODE" FORCE)
set(STEPCODE_DAI_LIBRARY stepdai CACHE STRING "Building bundled STEPCODE"
FORCE)
Modified: brlcad/branches/extbuild/src/other/ext/stepcode.dist
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode.dist 2020-11-07
02:31:05 UTC (rev 77704)
+++ brlcad/branches/extbuild/src/other/ext/stepcode.dist 2020-11-07
02:33:34 UTC (rev 77705)
@@ -60,8 +60,6 @@
include/stepcode/editor/editordefines.h
include/stepcode/editor/seeinfodefault.h
include/stepcode/export.h
-include/stepcode/exppp/CMakeLists.txt
-include/stepcode/exppp/exppp.h
include/stepcode/express/CMakeLists.txt
include/stepcode/express/alg.h
include/stepcode/express/basic.h
@@ -73,6 +71,7 @@
include/stepcode/express/entity.h
include/stepcode/express/error.h
include/stepcode/express/expbasic.h
+include/stepcode/express/exppp.h
include/stepcode/express/expr.h
include/stepcode/express/express.h
include/stepcode/express/hash.h
@@ -177,9 +176,6 @@
src/exp2cxx/selects.c
src/exp2cxx/trynext.cc
src/exp2cxx/write.cc
-src/exppp/CMakeLists.txt
-src/exppp/README
-src/exppp/exppp.c
src/express/CMakeLists.txt
src/express/Changes
src/express/README
@@ -189,6 +185,7 @@
src/express/entity.c
src/express/error.c
src/express/expparse.y
+src/express/exppp.c
src/express/expr.c
src/express/express.c
src/express/expscan.l
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
