Prepare our step converter codes to work with FindSTEPCODE results ra…

…ther than assuming build targets and an in-src-dir stepcode source tree.
BRL-CAD · Aug 17, 2023 · 199a10f · 199a10f
1 parent 971e04f
commit 199a10f
Show file tree

Hide file tree

Showing 11 changed files with 5,378 additions and 44 deletions.
diff --git a/src/conv/step/ap203e2-g/CMakeLists.txt b/src/conv/step/ap203e2-g/CMakeLists.txt
@@ -230,10 +230,10 @@ set(ap203e2g_LIBS
   librt
   libbu
   libbrep
-  steputils
-  stepeditor
-  stepdai
-  stepcore
+  ${STEPCODE_UTILS_LIBRARY}
+  ${STEPCODE_EDITOR_LIBRARY}
+  ${STEPCODE_DAI_LIBRARY}
+  ${STEPCODE_CORE_LIBRARY}
   ${OPENNURBS_LIBRARIES}
   )
 list(APPEND ap203e2g_LIBS ${ap203e2g_LIBS})

diff --git a/src/conv/step/ap214-g/CMakeLists.txt b/src/conv/step/ap214-g/CMakeLists.txt
@@ -232,10 +232,10 @@ set(ap214g_LIBS
   librt
   libbu
   libbrep
-  steputils
-  stepeditor
-  stepdai
-  stepcore
+  ${STEPCODE_UTILS_LIBRARY}
+  ${STEPCODE_EDITOR_LIBRARY}
+  ${STEPCODE_DAI_LIBRARY}
+  ${STEPCODE_CORE_LIBRARY}
   ${OPENNURBS_LIBRARIES}
   )
 list(APPEND ap214g_LIBS ${ap214g_LIBS})

diff --git a/src/conv/step/ap242-g/CMakeLists.txt b/src/conv/step/ap242-g/CMakeLists.txt
@@ -231,10 +231,10 @@ set(ap242g_LIBS
   librt
   libbu
   libbrep
-  steputils
-  stepeditor
-  stepdai
-  stepcore
+  ${STEPCODE_UTILS_LIBRARY}
+  ${STEPCODE_EDITOR_LIBRARY}
+  ${STEPCODE_DAI_LIBRARY}
+  ${STEPCODE_CORE_LIBRARY}
   ${OPENNURBS_LIBRARIES}
   )
 list(APPEND ap242g_LIBS ${ap242g_LIBS})

diff --git a/src/conv/step/g-ap203e2/CMakeLists.txt b/src/conv/step/g-ap203e2/CMakeLists.txt
@@ -38,10 +38,10 @@ set(gap203e2_LIBS
   libbrep
   libbn
   libbu
-  steputils
-  stepeditor
-  stepdai
-  stepcore
+  ${STEPCODE_UTILS_LIBRARY}
+  ${STEPCODE_EDITOR_LIBRARY}
+  ${STEPCODE_DAI_LIBRARY}
+  ${STEPCODE_CORE_LIBRARY}
   ${OPENNURBS_LIBRARIES}
   )
 list(APPEND gap203e2_LIBS ${gap203e2_LIBS})

diff --git a/src/conv/step/g-ap214/CMakeLists.txt b/src/conv/step/g-ap214/CMakeLists.txt
@@ -39,10 +39,10 @@ set(gap214_LIBS
   libbrep
   libbn
   libbu
-  steputils
-  stepeditor
-  stepdai
-  stepcore
+  ${STEPCODE_UTILS_LIBRARY}
+  ${STEPCODE_EDITOR_LIBRARY}
+  ${STEPCODE_DAI_LIBRARY}
+  ${STEPCODE_CORE_LIBRARY}
   ${OPENNURBS_LIBRARIES}
   )
 list(APPEND gap214_LIBS ${gap214_LIBS})

diff --git a/src/conv/step/g-ap242/CMakeLists.txt b/src/conv/step/g-ap242/CMakeLists.txt
@@ -35,10 +35,10 @@ set(gap242_LIBS
   libbrep
   libbn
   libbu
-  steputils
-  stepeditor
-  stepdai
-  stepcore
+  ${STEPCODE_UTILS_LIBRARY}
+  ${STEPCODE_EDITOR_LIBRARY}
+  ${STEPCODE_DAI_LIBRARY}
+  ${STEPCODE_CORE_LIBRARY}
   ${OPENNURBS_LIBRARIES}
   )
 list(APPEND gap242_LIBS ${gap242_LIBS})

diff --git a/src/conv/step/g-step/CMakeLists.txt b/src/conv/step/g-step/CMakeLists.txt
@@ -8,7 +8,7 @@ BRLCAD_INCLUDE_DIRS(STEPCODE_INCLUDE_DIRS)
 
 link_directories(${CMAKE_BINARY_DIR}/${LIB_DIR})
 
-set(STEP_SCHEMA_FILE ${CMAKE_SOURCE_DIR}/src/other/ext/stepcode/data/ap203/ap203.exp)
+set(STEP_SCHEMA_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../step-g/ap203.exp)
 add_definitions(-DAP203)
 
 GENERATE_SCHEMA_INPUTS(${STEP_SCHEMA_FILE} gstep)
@@ -39,10 +39,10 @@ if (BRLCAD_ENABLE_STEP)
     libbrep
     libbn
     libbu
-    steputils
-    stepeditor
-    stepdai
-    stepcore
+    ${STEPCODE_UTILS_LIBRARY}
+    ${STEPCODE_EDITOR_LIBRARY}
+    ${STEPCODE_DAI_LIBRARY}
+    ${STEPCODE_CORE_LIBRARY}
     ${OPENNURBS_LIBRARIES}
     )
 

diff --git a/src/conv/step/ifc-g/CMakeLists.txt b/src/conv/step/ifc-g/CMakeLists.txt
@@ -24,10 +24,10 @@ set(ifcg_LIBS
   librt
   libbu
   libbrep
-  steputils
-  stepeditor
-  stepdai
-  stepcore
+  ${STEPCODE_UTILS_LIBRARY}
+  ${STEPCODE_EDITOR_LIBRARY}
+  ${STEPCODE_DAI_LIBRARY}
+  ${STEPCODE_CORE_LIBRARY}
   ${OPENNURBS_LIBRARIES}
   )
 list(APPEND ifcg_LIBS ${ifcg_LIBS})

diff --git a/src/conv/step/step-g/CMakeLists.txt b/src/conv/step/step-g/CMakeLists.txt
@@ -8,7 +8,7 @@ BRLCAD_INCLUDE_DIRS(AP203_INCLUDE_DIRS)
 
 link_directories(${CMAKE_BINARY_DIR}/${LIB_DIR})
 
-set(STEP_SCHEMA_FILE ${CMAKE_SOURCE_DIR}/src/other/ext/stepcode/data/ap203/ap203.exp)
+set(STEP_SCHEMA_FILE ${CMAKE_CURRENT_SOURCE_DIR}/ap203.exp)
 add_definitions(-DAP203)
 
 GENERATE_SCHEMA_INPUTS(${STEP_SCHEMA_FILE} stepg)
@@ -460,10 +460,10 @@ if (BRLCAD_ENABLE_STEP)
     librt
     libbu
     libbrep
-    steputils
-    stepeditor
-    stepdai
-    stepcore
+    ${STEPCODE_UTILS_LIBRARY}
+    ${STEPCODE_EDITOR_LIBRARY}
+    ${STEPCODE_DAI_LIBRARY}
+    ${STEPCODE_CORE_LIBRARY}
     ${OPENNURBS_LIBRARIES}
     )
 
@@ -480,7 +480,10 @@ if (BRLCAD_ENABLE_STEP)
   endif(HIDE_INTERNAL_SYMBOLS)
 endif (BRLCAD_ENABLE_STEP)
 
-CMAKEFILES(CMakeLists.txt)
+CMAKEFILES(
+  CMakeLists.txt
+  ap203.exp
+  )
 
 # Local Variables:
 # tab-width: 8