celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [1/2] celix git commit: CELIX-413: Adds some additional variables normally set by FindCelix.cmake to the top level CMakeLists.txt file
Date Wed, 08 Nov 2017 19:25:26 GMT
Repository: celix
Updated Branches:
  refs/heads/develop 82c84186e -> 27b9648b0


CELIX-413: Adds some additional variables normally set by FindCelix.cmake to the top level
CMakeLists.txt file


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

Branch: refs/heads/develop
Commit: 918c2dde7b4cb0f6904e9e91a4439cb407b081ea
Parents: 82c8418
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Wed Nov 8 20:19:40 2017 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Wed Nov 8 20:19:40 2017 +0100

----------------------------------------------------------------------
 CMakeLists.txt | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/918c2dde/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d12cd2..e26fcf9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,19 @@ include(GNUInstallDirs)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
-SET(CMAKE_BUILD_TYPE "Debug")
+#Setup vars conform the FindCelix setup, so that examples and supporting cmake command can
assume these variables are set
+#TODO move this to a seperate cmake file or integrate in the FindCelix.cmake file
+set(CELIX_FOUND true)
+set(CELIX_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/framework/public/include ${CMAKE_SOURCE_DIR}/utils/public/include)
+set(CELIX_LIBRARIES celix_framework celix_utils celix_dfi)
+set(CELIX_LAUNCHER celix)
+#TODO CELIX_BUNDLES_DIR this will not work, maybe only use var (e.g. ${CELIX_SHELL_BUNDLE})
for bundles
+set(CELIX_DM_LIB dependency_manager_so)
+set(CELIX_DM_STATIC_LIB dependency_manager_static)
+set(CELIX_DM_STATIC_CXX_LIB dependency_manager_cxx_static)
+set(CELIX_PROJECT true) #Note this var is not set by FindCelix and can be used to test if
this is the celix project or a project using celix
+
+set(CMAKE_BUILD_TYPE "Debug")
 
 # see https://public.kitware.com/Bug/view.php?id=15696
 IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} EQUAL 3.3 AND ${CMAKE_GENERATOR} STREQUAL
"Unix Makefiles")


Mime
View raw message