You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2016/10/18 19:26:35 UTC
[33/50] [abbrv] celix git commit: CELIX-377: Updates left over usage
of lib to ${CMAKE_INSTALL_LIBDIR}
CELIX-377: Updates left over usage of lib to ${CMAKE_INSTALL_LIBDIR}
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/04013a0f
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/04013a0f
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/04013a0f
Branch: refs/heads/release/celix-2.0.0
Commit: 04013a0fb718ae86b7f95954cdd180e8086f6dd4
Parents: fcbbec5
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Tue Oct 11 14:15:26 2016 +0200
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Tue Oct 11 14:15:26 2016 +0200
----------------------------------------------------------------------
dependency_manager/CMakeLists.txt | 4 ++--
dependency_manager_cxx/CMakeLists.txt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/04013a0f/dependency_manager/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/dependency_manager/CMakeLists.txt b/dependency_manager/CMakeLists.txt
index 1161959..8f976c0 100644
--- a/dependency_manager/CMakeLists.txt
+++ b/dependency_manager/CMakeLists.txt
@@ -84,6 +84,6 @@ if (DEPENDENCY_MANAGER)
dependency_manager
)
install_bundle(dm_shell)
- install(TARGETS dependency_manager_static DESTINATION lib COMPONENT dependency_manager)
- #install(TARGETS dependency_manager_so DESTINATION lib COMPONENT dependency_manager)
+ install(TARGETS dependency_manager_static DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dependency_manager)
+ #install(TARGETS dependency_manager_so DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dependency_manager)
endif (DEPENDENCY_MANAGER)
http://git-wip-us.apache.org/repos/asf/celix/blob/04013a0f/dependency_manager_cxx/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/dependency_manager_cxx/CMakeLists.txt b/dependency_manager_cxx/CMakeLists.txt
index 8dc595c..6c9869e 100644
--- a/dependency_manager_cxx/CMakeLists.txt
+++ b/dependency_manager_cxx/CMakeLists.txt
@@ -63,5 +63,5 @@ if (DEPENDENCY_MANAGER_CXX)
dependency_manager_cxx
)
- install(TARGETS dependency_manager_cxx_static DESTINATION lib COMPONENT dependency_manager_cxx)
+ install(TARGETS dependency_manager_cxx_static DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dependency_manager_cxx)
endif (DEPENDENCY_MANAGER_CXX)