celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [3/3] celix git commit: CELIX-412: Reintroduces the CMake variable name used in Celix 2.0.0 for the C++ depman lib to ensure backward compatability
Date Mon, 16 Oct 2017 19:01:41 GMT
CELIX-412: Reintroduces the CMake variable name used in Celix 2.0.0 for the C++ depman lib
to ensure backward compatability


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

Branch: refs/heads/develop
Commit: b0ce481dc6c6e736d71421bf0239802f15741b40
Parents: b2984a4
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Mon Oct 16 21:08:51 2017 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Mon Oct 16 21:08:51 2017 +0200

----------------------------------------------------------------------
 cmake/FindCELIX.cmake | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/b0ce481d/cmake/FindCELIX.cmake
----------------------------------------------------------------------
diff --git a/cmake/FindCELIX.cmake b/cmake/FindCELIX.cmake
index db1be9d..43fba99 100644
--- a/cmake/FindCELIX.cmake
+++ b/cmake/FindCELIX.cmake
@@ -102,6 +102,7 @@ if (CELIX_DM_LIB)
     set(CELIX_DM_INCLUDE_DIR ${CELIX_INCLUDE_DIR}/dependency_manager)
 endif ()
 if (CELIX_DM_STATIC_CXX_LIB)
+	set(CELIX_DM_CXX_STATIC_LIB ${CELIX_DM_STATIC_CXX_LIB}) #Ensure that var name from verion
2.0.0 is still valid
     set(CELIX_DM_CXX_INCLUDE_DIR ${CELIX_INCLUDE_DIR}/dependency_manager_cxx)
 endif ()
 
@@ -118,3 +119,4 @@ if(CELIX_FOUND)
 	include(${CELIX_CMAKECELIX_FILE})
 	include_directories(${CELIX_INCLUDE_DIRS})
 endif()
+


Mime
View raw message