Revision: 77606
http://sourceforge.net/p/brlcad/code/77606
Author: starseeker
Date: 2020-10-23 14:06:27 +0000 (Fri, 23 Oct 2020)
Log Message:
-----------
Pull in updates to the various step programs from thirdparty_rework.
Modified Paths:
--------------
brlcad/branches/extbuild/src/conv/step/ap203e2-g/CMakeLists.txt
brlcad/branches/extbuild/src/conv/step/ap214-g/CMakeLists.txt
brlcad/branches/extbuild/src/conv/step/ap242-g/CMakeLists.txt
brlcad/branches/extbuild/src/conv/step/g-ap203e2/CMakeLists.txt
brlcad/branches/extbuild/src/conv/step/g-ap214/CMakeLists.txt
brlcad/branches/extbuild/src/conv/step/g-ap242/CMakeLists.txt
brlcad/branches/extbuild/src/conv/step/g-step/CMakeLists.txt
brlcad/branches/extbuild/src/conv/step/ifc-g/CMakeLists.txt
brlcad/branches/extbuild/src/conv/step/step-g/CMakeLists.txt
brlcad/branches/extbuild/src/conv/step/util/CMakeLists.txt
Modified: brlcad/branches/extbuild/src/conv/step/ap203e2-g/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/conv/step/ap203e2-g/CMakeLists.txt
2020-10-23 14:02:39 UTC (rev 77605)
+++ brlcad/branches/extbuild/src/conv/step/ap203e2-g/CMakeLists.txt
2020-10-23 14:06:27 UTC (rev 77606)
@@ -2,10 +2,13 @@
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../step-g
+ ${BRLCAD_BINARY_DIR}/${INCLUDE_DIR}/stepcode
${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/branches/extbuild/src/conv/step/ap214-g/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/conv/step/ap214-g/CMakeLists.txt
2020-10-23 14:02:39 UTC (rev 77605)
+++ brlcad/branches/extbuild/src/conv/step/ap214-g/CMakeLists.txt
2020-10-23 14:06:27 UTC (rev 77606)
@@ -3,8 +3,12 @@
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../step-g
+ ${BRLCAD_BINARY_DIR}/${INCLUDE_DIR}/stepcode
${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/branches/extbuild/src/conv/step/ap242-g/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/conv/step/ap242-g/CMakeLists.txt
2020-10-23 14:02:39 UTC (rev 77605)
+++ brlcad/branches/extbuild/src/conv/step/ap242-g/CMakeLists.txt
2020-10-23 14:06:27 UTC (rev 77606)
@@ -2,11 +2,15 @@
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../step-g
+ ${BRLCAD_BINARY_DIR}/${INCLUDE_DIR}/stepcode
${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)
+set(STEP_SCHEMA_FILE
${CMAKE_CURRENT_SOURCE_DIR}/../../../superbuild/stepcode/data/ap242/ap242e1.exp)
add_definitions(-DAP242)
GENERATE_SCHEMA_INPUTS(${STEP_SCHEMA_FILE} ap242g)
Modified: brlcad/branches/extbuild/src/conv/step/g-ap203e2/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/conv/step/g-ap203e2/CMakeLists.txt
2020-10-23 14:02:39 UTC (rev 77605)
+++ brlcad/branches/extbuild/src/conv/step/g-ap203e2/CMakeLists.txt
2020-10-23 14:06:27 UTC (rev 77606)
@@ -1,8 +1,12 @@
set(AP203_INCLUDE_DIRS
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_BINARY_DIR}/${INCLUDE_DIR}/stepcode
${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/branches/extbuild/src/conv/step/g-ap214/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/conv/step/g-ap214/CMakeLists.txt
2020-10-23 14:02:39 UTC (rev 77605)
+++ brlcad/branches/extbuild/src/conv/step/g-ap214/CMakeLists.txt
2020-10-23 14:06:27 UTC (rev 77606)
@@ -2,8 +2,12 @@
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../g-step
+ ${BRLCAD_BINARY_DIR}/${INCLUDE_DIR}/stepcode
${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/branches/extbuild/src/conv/step/g-ap242/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/conv/step/g-ap242/CMakeLists.txt
2020-10-23 14:02:39 UTC (rev 77605)
+++ brlcad/branches/extbuild/src/conv/step/g-ap242/CMakeLists.txt
2020-10-23 14:06:27 UTC (rev 77606)
@@ -2,11 +2,15 @@
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../g-step
+ ${BRLCAD_BINARY_DIR}/${INCLUDE_DIR}/stepcode
${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)
+set(STEP_SCHEMA_FILE
${CMAKE_CURRENT_SOURCE_DIR}/../../../superbuild/stepcode/data/ap242/ap242e1.exp)
add_definitions(-DAP242)
GENERATE_SCHEMA_INPUTS(${STEP_SCHEMA_FILE} gap242)
Modified: brlcad/branches/extbuild/src/conv/step/g-step/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/conv/step/g-step/CMakeLists.txt
2020-10-23 14:02:39 UTC (rev 77605)
+++ brlcad/branches/extbuild/src/conv/step/g-step/CMakeLists.txt
2020-10-23 14:06:27 UTC (rev 77606)
@@ -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/superbuild/stepcode/data/ap203/ap203.exp)
add_definitions(-DAP203)
GENERATE_SCHEMA_INPUTS(${STEP_SCHEMA_FILE} gstep)
Modified: brlcad/branches/extbuild/src/conv/step/ifc-g/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/conv/step/ifc-g/CMakeLists.txt 2020-10-23
14:02:39 UTC (rev 77605)
+++ brlcad/branches/extbuild/src/conv/step/ifc-g/CMakeLists.txt 2020-10-23
14:06:27 UTC (rev 77606)
@@ -1,8 +1,12 @@
set(IFC_INCLUDE_DIRS
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_BINARY_DIR}/${INCLUDE_DIR}/stepcode
${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/branches/extbuild/src/conv/step/step-g/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/conv/step/step-g/CMakeLists.txt
2020-10-23 14:02:39 UTC (rev 77605)
+++ brlcad/branches/extbuild/src/conv/step/step-g/CMakeLists.txt
2020-10-23 14:06:27 UTC (rev 77606)
@@ -1,11 +1,14 @@
set(AP203_INCLUDE_DIRS
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${OPENNURBS_INCLUDE_DIRS}
+ ${OPENNURBS_INCLUDE_DIR}
+ ${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/superbuild/stepcode/data/ap203/ap203.exp)
add_definitions(-DAP203)
#set(STEP_SCHEMA_FILE ${STEPCODE_DIR}/data/ap203e2/ap203e2_mim_lf.exp)
#add_definitions(-DAP203e2)
Modified: brlcad/branches/extbuild/src/conv/step/util/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/conv/step/util/CMakeLists.txt 2020-10-23
14:02:39 UTC (rev 77605)
+++ brlcad/branches/extbuild/src/conv/step/util/CMakeLists.txt 2020-10-23
14:06:27 UTC (rev 77606)
@@ -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/superbuild/stepcode/data/ap203/ap203.exp)
add_definitions(-DAP203)
GENERATE_SCHEMA_INPUTS(${STEP_SCHEMA_FILE} list_elements)
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
