Remove the express-only option

starseeker · starseeker · commit 4bf478b6e376 · 2020-12-14T16:09:26.000-05:00
diff --git a/cmake/SC_Build_opts.cmake b/cmake/SC_Build_opts.cmake
@@ -27,9 +27,6 @@ OPTION_WITH_DEFAULT(SC_CPP_GENERATOR "Compile exp2cxx" ON)
 OPTION_WITH_DEFAULT(SC_MEMMGR_ENABLE_CHECKS "Enable sc_memmgr's memory leak detection" OFF)
 OPTION_WITH_DEFAULT(SC_TRACE_FPRINTF "Enable extra comments in generated code so the code's source in exp2cxx may be located" OFF)
 
-option(SC_BUILD_EXPRESS_ONLY "Only build express parser." OFF)
-mark_as_advanced(SC_BUILD_EXPRESS_ONLY)
-
 option(DEBUGGING_GENERATED_SOURCES "disable md5 verification of generated sources" OFF)
 mark_as_advanced(DEBUGGING_GENERATED_SOURCES)
 
@@ -51,12 +48,10 @@ endif(SC_ENABLE_COVERAGE)
 #---------------------------------------------------------------------
 # Testing option
 OPTION_WITH_DEFAULT(SC_ENABLE_TESTING "Enable unittesting framework" OFF)
-if(SC_ENABLE_TESTING)
-  if(NOT ${SC_BUILD_EXPRESS_ONLY} AND NOT DEFINED SC_BUILD_SCHEMAS)
-    set(SC_BUILD_SCHEMAS "ALL") #test all schemas, unless otherwise specified
-  endif()
+if(SC_ENABLE_TESTING AND NOT DEFINED SC_BUILD_SCHEMAS)
+  set(SC_BUILD_SCHEMAS "ALL") #test all schemas, unless otherwise specified
   include(CTest)
-endif(SC_ENABLE_TESTING)
+endif()
 
 #---------------------------------------------------------------------
 # Executable install option
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
@@ -10,7 +10,7 @@
 # .exp file inside, which it uses. otherwise, ${path} is assumed to
 # be an express file.
 
-if(NOT ${SC_BUILD_EXPRESS_ONLY} AND NOT "${SC_BUILD_SCHEMAS}" STREQUAL "")
+if(NOT "${SC_BUILD_SCHEMAS}" STREQUAL "")
   include(${SC_CMAKE_DIR}/schema_scanner/schemaScanner.cmake)
   foreach(src ${SC_SDAI_ADDITIONAL_EXES_SRCS})
     get_filename_component(name ${src} NAME_WE)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -13,10 +13,8 @@ foreach(UNITARY_SCHEMA ${UNITARY_SCHEMAS})
   endif( UNITARY_SCHEMA MATCHES "fail_.*" )
 endforeach(UNITARY_SCHEMA ${UNITARY_SCHEMAS})
 
-if(NOT ${SC_BUILD_EXPRESS_ONLY})
-  add_subdirectory(p21)
-  add_subdirectory(cpp)
-endif()
+add_subdirectory(p21)
+add_subdirectory(cpp)
 
 # Local Variables:
 # tab-width: 8
