Make sure all test templates copied as well

hpcc-systems · Jan 10, 2019 · 50b6cf8 · 50b6cf8
1 parent 22b2501
commit 50b6cf8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/testing/unittests/configmgr/schema/environments/CMakeLists.txt b/testing/unittests/configmgr/schema/environments/CMakeLists.txt
@@ -15,8 +15,9 @@
 #    limitations under the License.
 ################################################################################
 
-
-FILE(GLOB envFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.xml")
-FOREACH( envFile ${envFiles} )
-    Install ( FILES ${envFile} DESTINATION testing/configmgr/schema/environments COMPONENT Runtime)
-ENDFOREACH ()
+if (USE_CPPUNIT)
+    FILE(GLOB envFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.xml")
+    FOREACH( envFile ${envFiles} )
+        Install ( FILES ${envFile} DESTINATION testing/configmgr/schema/environments COMPONENT Runtime)
+    ENDFOREACH ()
+endif()
diff --git a/testing/unittests/configmgr/templates/CMakeLists.txt b/testing/unittests/configmgr/templates/CMakeLists.txt
@@ -16,11 +16,8 @@
 ################################################################################
 
 if (USE_CPPUNIT)
-    FOREACH( iFILES
-            ${CMAKE_CURRENT_SOURCE_DIR}/ParseFromFileTest.json
-            ${CMAKE_CURRENT_SOURCE_DIR}/OperationsTest1.json
-            ${CMAKE_CURRENT_SOURCE_DIR}/SubstitutionTest-1.json
-            )
-        Install ( FILES ${iFILES} DESTINATION testing/configmgr/templates COMPONENT Runtime)
-    ENDFOREACH ( iFILES )
+    FILE(GLOB tmpltFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.json")
+    FOREACH( tmpltFile ${tmpltFiles} )
+        Install ( FILES ${tmpltFile} DESTINATION testing/configmgr/templates COMPONENT Runtime)
+    ENDFOREACH ()
 endif()