refactoring meta examples to be part of the test build; fixed some di…

…rectory issues
shogun-toolbox · Mar 10, 2016 · c29bb3a · c29bb3a
1 parent 9339f1a
commit c29bb3a
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 23 deletions.
diff --git a/examples/meta/CMakeLists.txt b/examples/meta/CMakeLists.txt
@@ -16,4 +16,25 @@ add_custom_target(meta_examples
     -t ${CMAKE_CURRENT_SOURCE_DIR}/generator/targets
     COMMENT "Generating examples from meta-language")
 
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/targets)
+# If testing is enabled we run the examples
+IF(ENABLE_TESTING)
+    # Python
+    IF (PythonModular AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/python)
+        add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/python)
+    ENDIF()
+
+    # java
+    IF (JavaModular AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/java)
+        add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/java)
+    ENDIF()
+
+    # octave
+    IF (OctaveModular AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/octave)
+        add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/octave)
+    ENDIF()
+
+    # r
+    IF (RModular AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/r)
+        add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/r)
+    ENDIF()
+ENDIF()
diff --git a/examples/meta/targets/java/CMakeLists.txt → examples/meta/java/CMakeLists.txt b/examples/meta/targets/java/CMakeLists.txt → examples/meta/java/CMakeLists.txt
diff --git a/examples/meta/targets/octave/CMakeLists.txt → examples/meta/octave/CMakeLists.txt b/examples/meta/targets/octave/CMakeLists.txt → examples/meta/octave/CMakeLists.txt
diff --git a/examples/meta/targets/python/CMakeLists.txt → examples/meta/python/CMakeLists.txt b/examples/meta/targets/python/CMakeLists.txt → examples/meta/python/CMakeLists.txt
diff --git a/examples/meta/targets/r/CMakeLists.txt → examples/meta/r/CMakeLists.txt b/examples/meta/targets/r/CMakeLists.txt → examples/meta/r/CMakeLists.txt
diff --git a/examples/meta/targets/CMakeLists.txt b/examples/meta/targets/CMakeLists.txt