celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [10/13] celix git commit: CELIX-418: disable building docker dir in osx
Date Tue, 30 Jan 2018 19:24:39 GMT
CELIX-418: disable building docker dir in osx


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

Branch: refs/heads/develop
Commit: 5f0bc1ce9c1b1f9df62a55b4632071625e604316
Parents: 06e4d11
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Wed Jan 17 21:03:22 2018 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Wed Jan 17 21:03:22 2018 +0100

----------------------------------------------------------------------
 cmake/cmake_celix/DockerPackaging.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/5f0bc1ce/cmake/cmake_celix/DockerPackaging.cmake
----------------------------------------------------------------------
diff --git a/cmake/cmake_celix/DockerPackaging.cmake b/cmake/cmake_celix/DockerPackaging.cmake
index e0ffe5e..74279c4 100644
--- a/cmake/cmake_celix/DockerPackaging.cmake
+++ b/cmake/cmake_celix/DockerPackaging.cmake
@@ -130,7 +130,7 @@ $<JOIN:$<TARGET_PROPERTY:${DOCKER_TARGET},DOCKER_PROPERTIES>,\\n\\
                 INPUT "${LAUNCHER_STAGE1}"
         )
 
-        add_executable(${DOCKER_TARGET} ${LAUNCHER_SRC})
+        add_executable(${DOCKER_TARGET} EXCLUDE_FROM_ALL ${LAUNCHER_SRC})
         #   set_target_properties(${DOCKER_TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${DOCKER_LOC})
         target_include_directories(${DOCKER_TARGET} PRIVATE ${CELIX_INCLUDE_DIRS})
         target_link_libraries(${DOCKER_TARGET} PRIVATE ${CELIX_FRAMEWORK_LIBRARY} ${CELIX_UTILS_LIBRARY})


Mime
View raw message