Revision: 77405
http://sourceforge.net/p/brlcad/code/77405
Author: starseeker
Date: 2020-10-10 19:49:24 +0000 (Sat, 10 Oct 2020)
Log Message:
-----------
Start setting up to deal with stepcode. This will require a proper
FindSTEPCODE.cmake to work as intended, as well as updating the step converter
CMake codes to actually use library variables rather than the build targets.
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/misc/CMake/BRLCAD_User_Options.cmake
brlcad/branches/thirdparty_rework/src/conv/step/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/conv/step/ap242-g/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/conv/step/g-ap242/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
Modified: brlcad/branches/thirdparty_rework/misc/CMake/BRLCAD_User_Options.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/misc/CMake/BRLCAD_User_Options.cmake
2020-10-10 19:47:59 UTC (rev 77404)
+++ brlcad/branches/thirdparty_rework/misc/CMake/BRLCAD_User_Options.cmake
2020-10-10 19:49:24 UTC (rev 77405)
@@ -164,6 +164,10 @@
endif(BRLCAD_ENABLE_BULLET)
mark_as_advanced(BRLCAD_ENABLE_BULLET)
+# Enable features requiring STEPcode library
+option(BRLCAD_ENABLE_STEP "Enable features requiring the STEP support
libraries" ON)
+mark_as_advanced(BRLCAD_ENABLE_STEP)
+
# Enable features requiring GDAL geospatial library
option(BRLCAD_ENABLE_GDAL "Enable features requiring the Geospatial Data
Abstraction Library" ON)
mark_as_advanced(BRLCAD_ENABLE_GDAL)
Modified: brlcad/branches/thirdparty_rework/src/conv/step/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/conv/step/CMakeLists.txt
2020-10-10 19:47:59 UTC (rev 77404)
+++ brlcad/branches/thirdparty_rework/src/conv/step/CMakeLists.txt
2020-10-10 19:49:24 UTC (rev 77405)
@@ -16,7 +16,7 @@
CHECK_CXX_FLAG("Wno-ignored-qualifiers")
-set(STEPCODE_DIR ${BRLCAD_SOURCE_DIR}/src/other/stepcode)
+set(STEPCODE_DIR ${BRLCAD_SOURCE_DIR}/src/superbuild/stepcode)
set(STEP_INCLUDE_DIRS
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
Modified: brlcad/branches/thirdparty_rework/src/conv/step/ap242-g/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/conv/step/ap242-g/CMakeLists.txt
2020-10-10 19:47:59 UTC (rev 77404)
+++ brlcad/branches/thirdparty_rework/src/conv/step/ap242-g/CMakeLists.txt
2020-10-10 19:49:24 UTC (rev 77405)
@@ -10,7 +10,7 @@
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/thirdparty_rework/src/conv/step/g-ap242/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/conv/step/g-ap242/CMakeLists.txt
2020-10-10 19:47:59 UTC (rev 77404)
+++ brlcad/branches/thirdparty_rework/src/conv/step/g-ap242/CMakeLists.txt
2020-10-10 19:49:24 UTC (rev 77405)
@@ -10,7 +10,7 @@
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/thirdparty_rework/src/superbuild/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-10 19:47:59 UTC (rev 77404)
+++ brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-10 19:49:24 UTC (rev 77405)
@@ -175,15 +175,15 @@
endif(NOT EXISTS "${VCVARS_BAT}")
endif(MSVC)
-
-
-# For now, turn everything on:
+# TODO - need to set these based on the feature flags...
set(BRLCAD_LEVEL2 ON)
set(BRLCAD_LEVEL3 ON)
+
+# TODO - in stand-alone mode, these need to be set to enable the builds...
#set(BRLCAD_ENABLE_STEP ON)
#set(BRLCAD_ENABLE_GDAL ON)
-set(BRLCAD_ENABLE_TCL ON)
-set(BRLCAD_ENABLE_TK ON)
+#set(BRLCAD_ENABLE_TCL ON)
+#set(BRLCAD_ENABLE_TK ON)
###############################################################################
# BRL-CAD and some of its dependencies require the lemon, re2c and perplex
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
