celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [19/42] celix git commit: CELIX-335: Fix in configure_file usage. Still contained @ONLY arguments
Date Fri, 05 Feb 2016 11:00:38 GMT
CELIX-335: Fix in configure_file usage. Still contained @ONLY arguments


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

Branch: refs/heads/develop
Commit: 0fe3c6aba7f1eadab07565772fd9bcd0bb449424
Parents: 7a042fd
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Thu Jan 14 15:58:11 2016 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Thu Jan 14 15:58:11 2016 +0100

----------------------------------------------------------------------
 CMakeLists.txt                                          |  4 +---
 .../remote_service_admin_dfi/rsa_tst/CMakeLists.txt     |  6 +++---
 .../private/test/CMakeLists.txt                         |  4 ++--
 remote_services/topology_manager/tms_tst/CMakeLists.txt | 12 ++++++------
 4 files changed, 12 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/0fe3c6ab/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d32f96f..aea2c23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,13 +15,11 @@
 # specific language governing permissions and limitations
 # under the License.
 
-cmake_minimum_required (VERSION 3.0)
+cmake_minimum_required (VERSION 3.2)
 project (Celix C CXX)
 
 cmake_policy(SET CMP0012 NEW)
 
-#SET(CMAKE_VERBOSE_MAKEFILE ON)
-
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)

http://git-wip-us.apache.org/repos/asf/celix/blob/0fe3c6ab/remote_services/remote_service_admin_dfi/rsa_tst/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/remote_service_admin_dfi/rsa_tst/CMakeLists.txt b/remote_services/remote_service_admin_dfi/rsa_tst/CMakeLists.txt
index ac845e6..d28ad0b 100644
--- a/remote_services/remote_service_admin_dfi/rsa_tst/CMakeLists.txt
+++ b/remote_services/remote_service_admin_dfi/rsa_tst/CMakeLists.txt
@@ -46,9 +46,9 @@ get_property(discovery_configured_bundle_file TARGET discovery_configured
PROPER
 get_property(topology_manager_bundle_file TARGET topology_manager PROPERTY BUNDLE_FILE)
 get_property(tst_bundle_file TARGET rsa_dfi_tst_bundle PROPERTY BUNDLE_FILE)
 
-configure_file(config.properties.in config.properties @ONLY)
-configure_file(client.properties.in client.properties @ONLY)
-configure_file(server.properties.in server.properties @ONLY)
+configure_file(config.properties.in config.properties)
+configure_file(client.properties.in client.properties)
+configure_file(server.properties.in server.properties)
 
 add_dependencies(test_rsa_dfi remote_service_admin_dfi calculator)
 

http://git-wip-us.apache.org/repos/asf/celix/blob/0fe3c6ab/remote_services/remote_service_admin_shm/private/test/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/remote_service_admin_shm/private/test/CMakeLists.txt b/remote_services/remote_service_admin_shm/private/test/CMakeLists.txt
index 4a0ae10..22d9c0b 100644
--- a/remote_services/remote_service_admin_shm/private/test/CMakeLists.txt
+++ b/remote_services/remote_service_admin_shm/private/test/CMakeLists.txt
@@ -48,8 +48,8 @@ get_property(calc_endpoint_bundle_file TARGET  org.apache.celix.calc.api.Calcula
 get_filename_component(client_endpoints ${calc_proxy_bundle_file} PATH)
 get_filename_component(server_endpoints ${calc_endpoint_bundle_file} PATH)
 
-configure_file(client.properties.in client.properties @ONLY)
-configure_file(server.properties.in server.properties @ONLY)
+configure_file(client.properties.in client.properties)
+configure_file(server.properties.in server.properties)
 
 add_dependencies(test_rsa_shm remote_service_admin_shm calculator org.apache.celix.calc.api.Calculator_proxy
org.apache.celix.calc.api.Calculator_endpoint)
  

http://git-wip-us.apache.org/repos/asf/celix/blob/0fe3c6ab/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 f55fe74..f985d00 100644
--- a/remote_services/topology_manager/tms_tst/CMakeLists.txt
+++ b/remote_services/topology_manager/tms_tst/CMakeLists.txt
@@ -44,13 +44,13 @@ get_property(test_bundle_file TARGET topology_manager_test_bundle PROPERTY
BUNDL
 #LOGHELPER_ENABLE_STDOUT_FALLBACK=true
 #org.osgi.framework.storage.clean=onFirstInit
 #")
-configure_file(config.properties.in config.properties @ONLY)
+configure_file(config.properties.in config.properties)
 
-configure_file(config_import.properties.in config_import.properties @ONLY)
-configure_file(scope.json scope.json @ONLY)
-configure_file(scope2.json scope2.json @ONLY)
-configure_file(scope3.json scope3.json @ONLY)
-configure_file(scope4.json scope4.json @ONLY)
+configure_file(config_import.properties.in config_import.properties)
+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)


Mime
View raw message