celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject celix git commit: CELIX-369: Reverts how scope files are copied for the scoped topology manager test. the custom command seems not to work.
Date Wed, 20 Jul 2016 13:13:17 GMT
Repository: celix
Updated Branches:
  refs/heads/develop b14072c50 -> ffc2a9ad8


CELIX-369: Reverts how scope files are copied for the scoped topology manager test. the custom
command seems not to work.


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/ffc2a9ad
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/ffc2a9ad
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/ffc2a9ad

Branch: refs/heads/develop
Commit: ffc2a9ad84d6de35f955d38d9b3117532a4a0fc7
Parents: b14072c
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Wed Jul 20 15:12:17 2016 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Wed Jul 20 15:12:17 2016 +0200

----------------------------------------------------------------------
 .../topology_manager/tms_tst/CMakeLists.txt         | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/ffc2a9ad/remote_services/topology_manager/tms_tst/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/topology_manager/tms_tst/CMakeLists.txt b/remote_services/topology_manager/tms_tst/CMakeLists.txt
index 6f30ba9..16ad011 100644
--- a/remote_services/topology_manager/tms_tst/CMakeLists.txt
+++ b/remote_services/topology_manager/tms_tst/CMakeLists.txt
@@ -59,10 +59,18 @@ LOGHELPER_ENABLE_STDOUT_FALLBACK=true
 org.osgi.framework.storage.clean=onFirstInit
 ")
 
-add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scope.json" COMMAND ${CMAKE_COMMAND}
-E copy_if_different "scope.json" "${CMAKE_CURRENT_BINARY_DIR}/scope.json")
-add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scope2.json" COMMAND ${CMAKE_COMMAND}
-E copy_if_different "scope2.json" "${CMAKE_CURRENT_BINARY_DIR}/scope2.json")
-add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scope3.json" COMMAND ${CMAKE_COMMAND}
-E copy_if_different "scope3.json" "${CMAKE_CURRENT_BINARY_DIR}/scope3.json")
-add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scope4.json" COMMAND ${CMAKE_COMMAND}
-E copy_if_different "scope4.json" "${CMAKE_CURRENT_BINARY_DIR}/scope4.json")
+
+#TODO improve copy commands, for now using configure_file as copy 
+#add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scope.json" COMMAND ${CMAKE_COMMAND}
-E copy_if_different "${CMAKE_CURRENT_SOURE_DIR}/scope.json" "${CMAKE_CURRENT_BINARY_DIR}/scope.json")
+#add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scope2.json" COMMAND ${CMAKE_COMMAND}
-E copy_if_different "${CMAKE_CURRENT_SOURE_DIR}/scope2.json" "${CMAKE_CURRENT_BINARY_DIR}/scope2.json")
+#add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scope3.json" COMMAND ${CMAKE_COMMAND}
-E copy_if_different "${CMAKE_CURRENT_SOURE_DIR}/scope3.json" "${CMAKE_CURRENT_BINARY_DIR}/scope3.json")
+#add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scope4.json" COMMAND ${CMAKE_COMMAND}
-E copy_if_different "${CMAKE_CURRENT_SOURE_DIR}/scope4.json" "${CMAKE_CURRENT_BINARY_DIR}/scope4.json")
+
+configure_file("scope.json" "scope.json")
+configure_file("scope2.json" "scope2.json")
+configure_file("scope3.json" "scope3.json")
+configure_file("scope4.json" "scope4.json")
+
 
 add_test(NAME run_test_tm_scoped COMMAND test_tm_scoped)
 SETUP_TARGET_FOR_COVERAGE(test_tm_scoped_cov test_tm_scoped ${CMAKE_BINARY_DIR}/coverage/test_tm_scoped/test_tm_scoped)


Mime
View raw message