Simplify BUILD_SHARED_LIBS and BUILD_STATIC_LIBS options.

starseeker · starseeker · commit 5d8c597d8f73 · 2020-12-14T15:58:24.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -151,7 +151,7 @@ add_subdirectory(doc)
 
 # 'make core' builds everything that isn't generated. for devs.
 add_custom_target(core)
-if($CACHE{SC_BUILD_SHARED_LIBS})
+if(BUILD_SHARED_LIBS)
   add_dependencies(core stepdai stepeditor exp2cxx check-express)
 else()
   add_dependencies(core stepdai-static stepeditor-static exp2cxx check-express)
diff --git a/cmake/SC_Build_opts.cmake b/cmake/SC_Build_opts.cmake
@@ -16,10 +16,10 @@ macro(OPTION_WITH_DEFAULT OPTION_NAME OPTION_STRING OPTION_DEFAULT)
 endmacro(OPTION_WITH_DEFAULT OPTION_NAME OPTION_STRING OPTION_DEFAULT)
 
 # build shared libs by default
-OPTION_WITH_DEFAULT(SC_BUILD_SHARED_LIBS "Build shared libs" ON)
+option(BUILD_SHARED_LIBS "Build shared libs" ON)
 
 # don't build static libs by default
-OPTION_WITH_DEFAULT(SC_BUILD_STATIC_LIBS "Build static libs" OFF)
+OPTION_WITH_DEFAULT(BUILD_STATIC_LIBS "Build static libs" OFF)
 
 OPTION_WITH_DEFAULT(SC_PYTHON_GENERATOR "Compile exp2python" ON)
 OPTION_WITH_DEFAULT(SC_CPP_GENERATOR "Compile exp2cxx" ON)
@@ -39,8 +39,8 @@ OPTION_WITH_DEFAULT(SC_ENABLE_COVERAGE "Enable code coverage test" OFF)
 if(SC_ENABLE_COVERAGE)
   set(SC_ENABLE_TESTING ON CACHE BOOL "Testing enabled by coverage option" FORCE)
   # build static libs, better coverage report
-  set(SC_BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE)
-  set(SC_BUILD_STATIC_LIBS ON CACHE BOOL "Build static libs" FORCE)
+  set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE)
+  set(BUILD_STATIC_LIBS ON CACHE BOOL "Build static libs" FORCE)
   set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -fprofile-arcs -ftest-coverage" CACHE STRING "Extra compile flags required by code coverage" FORCE)
   set(CMAKE_C_FLAGS_DEBUG "-O0 -g -fprofile-arcs -ftest-coverage" CACHE STRING "Extra compile flags required by code coverage" FORCE)
   set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "-fprofile-arcs -ftest-coverage" CACHE STRING "Extra linker flags required by code coverage" FORCE)
diff --git a/cmake/SC_CXX_schema_macros.cmake b/cmake/SC_CXX_schema_macros.cmake
@@ -93,7 +93,7 @@ macro(SCHEMA_TARGETS expFile schemaName sourceFiles)
     ${SC_SOURCE_DIR}/src/base/judy/src
   )
   # if testing is enabled, "TESTABLE" sets property EXCLUDE_FROM_ALL and prevents installation
-  if($CACHE{SC_BUILD_SHARED_LIBS})
+  if(BUILD_SHARED_LIBS)
     SC_ADDLIB(${PROJECT_NAME} SHARED SOURCES ${sourceFiles} LINK_LIBRARIES stepdai stepcore stepeditor steputils base TESTABLE)
     add_dependencies(${PROJECT_NAME} generate_cpp_${PROJECT_NAME})
     if(WIN32)
diff --git a/example/ap203min/ExternalProjectBuild/cmake/External_STEPCode.cmake b/example/ap203min/ExternalProjectBuild/cmake/External_STEPCode.cmake
@@ -26,4 +26,3 @@ SET( STEPCODE_BINARY_DIR ${BINARY_DIR} )
 # Consequently, force Debug so it installs in ../sc-install directory
 # instead of /usr/local/lib.
 #
-# SC's own programs fail to build with -DSC_BUILD_SHARED_LIBS=OFF

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ macro(SCHEMA_TARGETS expFile schemaName sourceFiles)`
`93`	`93`	`${SC_SOURCE_DIR}/src/base/judy/src`
`94`	`94`	`)`
`95`	`95`	`# if testing is enabled, "TESTABLE" sets property EXCLUDE_FROM_ALL and prevents installation`
`96`		`- if($CACHE{SC_BUILD_SHARED_LIBS})`
	`96`	`+ if(BUILD_SHARED_LIBS)`
`97`	`97`	`SC_ADDLIB(${PROJECT_NAME} SHARED SOURCES ${sourceFiles} LINK_LIBRARIES stepdai stepcore stepeditor steputils base TESTABLE)`
`98`	`98`	`add_dependencies(${PROJECT_NAME} generate_cpp_${PROJECT_NAME})`
`99`	`99`	`if(WIN32)`
Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,3 @@ SET( STEPCODE_BINARY_DIR ${BINARY_DIR} )`
`26`	`26`	`# Consequently, force Debug so it installs in ../sc-install directory`
`27`	`27`	`# instead of /usr/local/lib.`
`28`	`28`	`#`
`29`		`-# SC's own programs fail to build with -DSC_BUILD_SHARED_LIBS=OFF`