ensure when SC_BUILD_EXPRESS_ONLY is set that we do not build the schema scanner

cshorler · cshorler · commit a4d1e03f0d2b · 2020-07-21T15:25:38.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,7 +42,7 @@ project(SC)
 
 # SC version
 set(SC_VERSION_MAJOR 0)
-set(SC_VERSION_MINOR 7-dev)
+set(SC_VERSION_MINOR 8-dev)
 set(SC_VERSION ${SC_VERSION_MAJOR}.${SC_VERSION_MINOR})
 
 # SC ABI version. SC_ABI_SOVERSION should be incremented
diff --git a/cmake/SC_Build_opts.cmake b/cmake/SC_Build_opts.cmake
@@ -60,6 +60,9 @@ OPTION_WITH_DEFAULT(SC_GIT_VERSION "Build using version from git" ON)
 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)
+
 #---------------------------------------------------------------------
 # Coverage option
 OPTION_WITH_DEFAULT(SC_ENABLE_COVERAGE "Enable code coverage test" OFF)
@@ -79,11 +82,10 @@ endif(SC_ENABLE_COVERAGE)
 # Testing option
 OPTION_WITH_DEFAULT(SC_ENABLE_TESTING "Enable unittesting framework" OFF)
 if(SC_ENABLE_TESTING)
-  if(NOT DEFINED SC_BUILD_SCHEMAS)
+  if(NOT ${SC_BUILD_EXPRESS_ONLY} AND NOT DEFINED SC_BUILD_SCHEMAS)
     set(SC_BUILD_SCHEMAS "ALL") #test all schemas, unless otherwise specified
   endif()
   include(CTest)
-  ENABLE_TESTING()
 endif(SC_ENABLE_TESTING)
 
 #---------------------------------------------------------------------
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_SCHEMAS}" STREQUAL "")
+if(NOT ${SC_BUILD_EXPRESS_ONLY} AND 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)
@@ -25,7 +25,7 @@ if(NOT "${SC_BUILD_SCHEMAS}" STREQUAL "")
     LOCATE_SCHEMA(${FILE} abspath)
     SCHEMA_CMLIST(${abspath})
   endforeach()
-endif(NOT "${SC_BUILD_SCHEMAS}" STREQUAL "")
+endif()
 
 # Local Variables:
 # tab-width: 8
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -13,8 +13,10 @@ foreach(UNITARY_SCHEMA ${UNITARY_SCHEMAS})
   endif( UNITARY_SCHEMA MATCHES "fail_.*" )
 endforeach(UNITARY_SCHEMA ${UNITARY_SCHEMAS})
 
-add_subdirectory(p21)
-add_subdirectory(cpp)
+if(NOT ${SC_BUILD_EXPRESS_ONLY})
+  add_subdirectory(p21)
+  add_subdirectory(cpp)
+endif()
 
 # Local Variables:
 # tab-width: 8
