Revision: 77928
http://sourceforge.net/p/brlcad/code/77928
Author: starseeker
Date: 2020-12-04 17:06:37 +0000 (Fri, 04 Dec 2020)
Log Message:
-----------
Incorporate what should (currently) be no-op CMake changes for step converters
from extbuild.
Modified Paths:
--------------
brlcad/trunk/src/conv/step/ap203e2-g/CMakeLists.txt
brlcad/trunk/src/conv/step/ap214-g/CMakeLists.txt
brlcad/trunk/src/conv/step/ap242-g/CMakeLists.txt
brlcad/trunk/src/conv/step/g-ap203e2/CMakeLists.txt
brlcad/trunk/src/conv/step/g-ap214/CMakeLists.txt
brlcad/trunk/src/conv/step/g-ap242/CMakeLists.txt
brlcad/trunk/src/conv/step/g-step/CMakeLists.txt
brlcad/trunk/src/conv/step/ifc-g/CMakeLists.txt
brlcad/trunk/src/conv/step/step-g/CMakeLists.txt
brlcad/trunk/src/conv/step/util/CMakeLists.txt
Modified: brlcad/trunk/src/conv/step/ap203e2-g/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/ap203e2-g/CMakeLists.txt 2020-12-04 16:54:52 UTC
(rev 77927)
+++ brlcad/trunk/src/conv/step/ap203e2-g/CMakeLists.txt 2020-12-04 17:06:37 UTC
(rev 77928)
@@ -2,10 +2,13 @@
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../step-g
+ ${STEPCODE_INCLUDE_DIRS}
${OPENNURBS_INCLUDE_DIRS}
)
BRLCAD_INCLUDE_DIRS(AP203_INCLUDE_DIRS)
+link_directories(${CMAKE_BINARY_DIR}/${LIB_DIR})
+
set(STEP_SCHEMA_FILE ${STEPCODE_DIR}/data/ap203e2/ap203e2_mim_lf.exp)
add_definitions(-DAP203e2)
Modified: brlcad/trunk/src/conv/step/ap214-g/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/ap214-g/CMakeLists.txt 2020-12-04 16:54:52 UTC
(rev 77927)
+++ brlcad/trunk/src/conv/step/ap214-g/CMakeLists.txt 2020-12-04 17:06:37 UTC
(rev 77928)
@@ -3,8 +3,12 @@
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../step-g
+ ${STEPCODE_INCLUDE_DIRS}
${OPENNURBS_INCLUDE_DIRS}
)
+
+link_directories(${CMAKE_BINARY_DIR}/${LIB_DIR})
+
BRLCAD_INCLUDE_DIRS(AP214_INCLUDE_DIRS)
set(STEP_SCHEMA_FILE ${STEPCODE_DIR}/data/ap214e3/AP214E3_2010.exp)
Modified: brlcad/trunk/src/conv/step/ap242-g/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/ap242-g/CMakeLists.txt 2020-12-04 16:54:52 UTC
(rev 77927)
+++ brlcad/trunk/src/conv/step/ap242-g/CMakeLists.txt 2020-12-04 17:06:37 UTC
(rev 77928)
@@ -2,8 +2,12 @@
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../step-g
+ ${STEPCODE_INCLUDE_DIRS}
${OPENNURBS_INCLUDE_DIRS}
)
+
+link_directories(${CMAKE_BINARY_DIR}/${LIB_DIR})
+
BRLCAD_INCLUDE_DIRS(AP242_INCLUDE_DIRS)
set(STEP_SCHEMA_FILE
${CMAKE_CURRENT_SOURCE_DIR}/../../../other/stepcode/data/ap242/ap242e1.exp)
Modified: brlcad/trunk/src/conv/step/g-ap203e2/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/g-ap203e2/CMakeLists.txt 2020-12-04 16:54:52 UTC
(rev 77927)
+++ brlcad/trunk/src/conv/step/g-ap203e2/CMakeLists.txt 2020-12-04 17:06:37 UTC
(rev 77928)
@@ -1,8 +1,12 @@
set(AP203_INCLUDE_DIRS
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
+ ${STEPCODE_INCLUDE_DIRS}
${OPENNURBS_INCLUDE_DIRS}
)
+
+link_directories(${CMAKE_BINARY_DIR}/${LIB_DIR})
+
BRLCAD_INCLUDE_DIRS(AP203_INCLUDE_DIRS)
set(STEP_SCHEMA_FILE ${STEPCODE_DIR}/data/ap203e2/ap203e2_mim_lf.exp)
Modified: brlcad/trunk/src/conv/step/g-ap214/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/g-ap214/CMakeLists.txt 2020-12-04 16:54:52 UTC
(rev 77927)
+++ brlcad/trunk/src/conv/step/g-ap214/CMakeLists.txt 2020-12-04 17:06:37 UTC
(rev 77928)
@@ -2,8 +2,12 @@
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../g-step
+ ${STEPCODE_INCLUDE_DIRS}
${OPENNURBS_INCLUDE_DIRS}
)
+
+link_directories(${CMAKE_BINARY_DIR}/${LIB_DIR})
+
BRLCAD_INCLUDE_DIRS(AP214_INCLUDE_DIRS)
set(STEP_SCHEMA_FILE ${STEPCODE_DIR}/data/ap214e3/AP214E3_2010.exp)
Modified: brlcad/trunk/src/conv/step/g-ap242/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/g-ap242/CMakeLists.txt 2020-12-04 16:54:52 UTC
(rev 77927)
+++ brlcad/trunk/src/conv/step/g-ap242/CMakeLists.txt 2020-12-04 17:06:37 UTC
(rev 77928)
@@ -2,8 +2,12 @@
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../g-step
+ ${STEPCODE_INCLUDE_DIRS}
${OPENNURBS_INCLUDE_DIRS}
)
+
+link_directories(${CMAKE_BINARY_DIR}/${LIB_DIR})
+
BRLCAD_INCLUDE_DIRS(AP242_INCLUDE_DIRS)
set(STEP_SCHEMA_FILE
${CMAKE_CURRENT_SOURCE_DIR}/../../../other/stepcode/data/ap242/ap242e1.exp)
Modified: brlcad/trunk/src/conv/step/g-step/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/g-step/CMakeLists.txt 2020-12-04 16:54:52 UTC
(rev 77927)
+++ brlcad/trunk/src/conv/step/g-step/CMakeLists.txt 2020-12-04 17:06:37 UTC
(rev 77928)
@@ -2,9 +2,12 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
+ ${STEPCODE_INCLUDE_DIRS}
)
-set(STEP_SCHEMA_FILE ${STEPCODE_DIR}/data/ap203/ap203.exp)
+link_directories(${CMAKE_BINARY_DIR}/${LIB_DIR})
+
+set(STEP_SCHEMA_FILE
${CMAKE_SOURCE_DIR}/src/other/stepcode/data/ap203/ap203.exp)
add_definitions(-DAP203)
GENERATE_SCHEMA_INPUTS(${STEP_SCHEMA_FILE} gstep)
@@ -45,6 +48,7 @@
BRLCAD_ADDEXEC(g-step "${gstep_SOURCES}" "${gstep_LIBS}" NO_STRICT)
add_dependencies(g-step step-express-${SCHEMA_NAME}-gstep)
set_property(TARGET g-step APPEND PROPERTY INCLUDE_DIRECTORIES
"${gstep_SCHEMA_OUT_DIR}")
+ target_compile_definitions(g-step PRIVATE SC_SCHEMA_DLL_EXPORTS)
if (HIDE_INTERNAL_SYMBOLS)
set(gstep_IMPORTS
Modified: brlcad/trunk/src/conv/step/ifc-g/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/ifc-g/CMakeLists.txt 2020-12-04 16:54:52 UTC
(rev 77927)
+++ brlcad/trunk/src/conv/step/ifc-g/CMakeLists.txt 2020-12-04 17:06:37 UTC
(rev 77928)
@@ -1,8 +1,12 @@
set(IFC_INCLUDE_DIRS
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
+ ${STEPCODE_INCLUDE_DIRS}
${OPENNURBS_INCLUDE_DIRS}
)
+
+link_directories(${CMAKE_BINARY_DIR}/${LIB_DIR})
+
BRLCAD_INCLUDE_DIRS(IFC_INCLUDE_DIRS)
set(IFC_SCHEMA_FILE ${STEPCODE_DIR}/data/ifc4/IFC4.exp)
Modified: brlcad/trunk/src/conv/step/step-g/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/step-g/CMakeLists.txt 2020-12-04 16:54:52 UTC
(rev 77927)
+++ brlcad/trunk/src/conv/step/step-g/CMakeLists.txt 2020-12-04 17:06:37 UTC
(rev 77928)
@@ -2,10 +2,13 @@
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${OPENNURBS_INCLUDE_DIRS}
+ ${STEPCODE_INCLUDE_DIRS}
)
BRLCAD_INCLUDE_DIRS(AP203_INCLUDE_DIRS)
-set(STEP_SCHEMA_FILE ${STEPCODE_DIR}/data/ap203/ap203.exp)
+link_directories(${CMAKE_BINARY_DIR}/${LIB_DIR})
+
+set(STEP_SCHEMA_FILE
${CMAKE_SOURCE_DIR}/src/other/stepcode/data/ap203/ap203.exp)
add_definitions(-DAP203)
#set(STEP_SCHEMA_FILE ${STEPCODE_DIR}/data/ap203e2/ap203e2_mim_lf.exp)
#add_definitions(-DAP203e2)
@@ -469,6 +472,7 @@
BRLCAD_ADDEXEC(step-g "${stepg_SOURCES}" "${stepg_LIBS}" NO_STRICT)
add_dependencies(step-g step-express-${SCHEMA_NAME}-stepg)
set_property(TARGET step-g APPEND PROPERTY INCLUDE_DIRECTORIES
"${stepg_SCHEMA_OUT_DIR}")
+ target_compile_definitions(step-g PRIVATE SC_SCHEMA_DLL_EXPORTS)
if(HIDE_INTERNAL_SYMBOLS)
set(SCIMPORTS SC_CORE_DLL_IMPORTS SC_DAI_DLL_IMPORTS SC_EDITOR_DLL_IMPORTS
SC_UTILS_DLL_IMPORTS ON_DLL_IMPORTS)
Modified: brlcad/trunk/src/conv/step/util/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/util/CMakeLists.txt 2020-12-04 16:54:52 UTC
(rev 77927)
+++ brlcad/trunk/src/conv/step/util/CMakeLists.txt 2020-12-04 17:06:37 UTC
(rev 77928)
@@ -1,9 +1,12 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
+ ${STEPCODE_INCLUDE_DIRS}
)
-set(STEP_SCHEMA_FILE ${STEPCODE_DIR}/data/ap203/ap203.exp)
+link_directories(${CMAKE_BINARY_DIR}/${LIB_DIR})
+
+set(STEP_SCHEMA_FILE
${CMAKE_SOURCE_DIR}/src/other/stepcode/data/ap203/ap203.exp)
add_definitions(-DAP203)
GENERATE_SCHEMA_INPUTS(${STEP_SCHEMA_FILE} list_elements)
@@ -25,6 +28,7 @@
BRLCAD_ADDEXEC(list_elements "${list_elements_srcs}" "${lelem_LIBS}"
NO_STRICT NO_INSTALL)
add_dependencies(list_elements step-express-${SCHEMA_NAME}-list_elements)
set_property(TARGET list_elements APPEND PROPERTY INCLUDE_DIRECTORIES
"${list_elements_SCHEMA_OUT_DIR}")
+ target_compile_definitions(list_elements PRIVATE SC_SCHEMA_DLL_EXPORTS)
if (HIDE_INTERNAL_SYMBOLS)
set(list_elements_IMPORTS
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
