clean up a bit

mpictor · mpictor · commit 3ee5fc0ca808 · 2013-12-27T14:12:09.000-05:00
diff --git a/src/exp2cxx/CMakeLists.txt b/src/exp2cxx/CMakeLists.txt
@@ -33,4 +33,8 @@ include_directories(
 
 SC_ADDEXEC(exp2cxx "${exp2cxx_SOURCES}" "libexppp;express;base")
 
-add_dependencies( exp2cxx version_string )
+add_dependencies( exp2cxx version_string )
+
+if( SC_ENABLE_TESTING )
+  add_subdirectory(test)
+endif( SC_ENABLE_TESTING )
diff --git a/src/exppp/test/CMakeLists.txt b/src/exppp/test/CMakeLists.txt
@@ -18,17 +18,21 @@ set_tests_properties( test_breakLongStr PROPERTIES DEPENDS build_tst_breakLongSt
 
 #could run test schemas through exppp, then check line length...
 
+
+# ---- syntax tests ----
+set( unitary_dir ${SC_SOURCE_DIR}/test/unitary_schemas )
+
 add_test( NAME test_exppp_unique_qualifiers
           WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
           COMMAND ${CMAKE_COMMAND} -DEXPPP=$<TARGET_FILE:exppp>
-                                   -DINFILE=${SC_SOURCE_DIR}/test/unitary_schemas/unique_qualifiers.exp
+                                   -DINFILE=${unitary_dir}/unique_qualifiers.exp
                                    -P ${CMAKE_CURRENT_SOURCE_DIR}/unique_qualifiers.cmake
         )
 
 add_test( NAME test_exppp_inverse_qualifiers
           WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
           COMMAND ${CMAKE_COMMAND} -DEXPPP=$<TARGET_FILE:exppp>
-                                   -DINFILE=${SC_SOURCE_DIR}/test/unitary_schemas/inverse_qualifiers.exp
+                                   -DINFILE=${unitary_dir}/inverse_qualifiers.exp
                                    -P ${CMAKE_CURRENT_SOURCE_DIR}/inverse_qualifiers.cmake
         )
 set_tests_properties( test_exppp_unique_qualifiers test_exppp_inverse_qualifiers PROPERTIES DEPENDS exppp )
diff --git a/src/express/CMakeLists.txt b/src/express/CMakeLists.txt
@@ -117,7 +117,9 @@ add_dependencies(express express_verify)
 add_dependencies(express version_string)
 SC_ADDEXEC("check-express" "${CHECK_EXPRESS_SOURCES}" "express;base" )
 
-add_subdirectory(test)
+if( SC_ENABLE_TESTING )
+  add_subdirectory(test)
+endif( SC_ENABLE_TESTING )
 
 # Local Variables:
 # tab-width: 8
