From c1a77f14b0e1d7dcf5b40065da28fd1da9ae50cc Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Mon, 23 Sep 2013 17:52:07 +0200
Subject: [PATCH] Different location of installed libraries for Windows and
Linux
---
Core/CMakeLists.txt | 11 ++++++++---
Fit/CMakeLists.txt | 10 +++++++---
README | 1 +
ThirdParty/RootMinimizers/CMakeLists.txt | 2 +-
4 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt
index f55917bfe35..7b04a129a26 100644
--- a/Core/CMakeLists.txt
+++ b/Core/CMakeLists.txt
@@ -88,14 +88,19 @@ endif()
# -----------------------------------------------
# installation
-# FIXME installation goes in two place (lib, bin), this is temporary
# -----------------------------------------------
install (DIRECTORY ${CMAKE_SOURCE_DIR}/Examples/ DESTINATION Examples COMPONENT Examples FILES_MATCHING PATTERN "*.py" )
install (DIRECTORY ${CMAKE_SOURCE_DIR}/Examples/ DESTINATION Examples COMPONENT Examples FILES_MATCHING PATTERN "README")
install (DIRECTORY ${CMAKE_SOURCE_DIR}/bin/ DESTINATION bin COMPONENT Libraries)
-#install (TARGETS ${library_name} DESTINATION lib COMPONENT Libraries)
-install (TARGETS ${library_name} DESTINATION bin COMPONENT Libraries)
+if(WIN32)
+ set(libdir "bin")
+else()
+ set(libdir "lib")
+endif()
+install (TARGETS ${library_name} DESTINATION ${libdir} COMPONENT Libraries)
+
+# windows requires to rename *.dll into *.pyd to use them from python
if(WIN32 AND BORNAGAIN_PYTHON)
install(FILES
${CMAKE_BINARY_DIR}/lib/${libprefix}${library_name}.pyd
diff --git a/Fit/CMakeLists.txt b/Fit/CMakeLists.txt
index 7d3f50c693d..aa389292b12 100644
--- a/Fit/CMakeLists.txt
+++ b/Fit/CMakeLists.txt
@@ -74,11 +74,15 @@ endif()
# -----------------------------------------------
# installation
-# FIXME installation goes in two place (lib, bin), this is temporary
# -----------------------------------------------
-#install (TARGETS ${library_name} DESTINATION lib COMPONENT Libraries)
-install (TARGETS ${library_name} DESTINATION bin COMPONENT Libraries)
+if(WIN32)
+ set(libdir "bin")
+else()
+ set(libdir "lib")
+endif()
+install (TARGETS ${library_name} DESTINATION ${libdir} COMPONENT Libraries)
+# windows requires to rename *.dll into *.pyd to use them from python
if(WIN32 AND BORNAGAIN_PYTHON)
install(FILES ${CMAKE_BINARY_DIR}/lib/${libprefix}${library_name}.pyd DESTINATION lib COMPONENT Libraries)
install(FILES ${CMAKE_BINARY_DIR}/lib/${libprefix}${library_name}.pyd DESTINATION bin COMPONENT Libraries)
diff --git a/README b/README
index e132126f846..0bc01a6a25f 100644
--- a/README
+++ b/README
@@ -8,3 +8,4 @@ changelog : see Doc/CHANGELOG
+
diff --git a/ThirdParty/RootMinimizers/CMakeLists.txt b/ThirdParty/RootMinimizers/CMakeLists.txt
index b4271bc55d1..0bc6ca215e9 100644
--- a/ThirdParty/RootMinimizers/CMakeLists.txt
+++ b/ThirdParty/RootMinimizers/CMakeLists.txt
@@ -42,4 +42,4 @@ include_directories(${GSL_INCLUDE_DIRS})
target_link_libraries(${library_name} ${GSL_LIBRARIES})
# --- installation ---
-install (TARGETS ${library_name} DESTINATION lib COMPONENT Libraries)
+#install (TARGETS ${library_name} DESTINATION lib COMPONENT Libraries)
--
GitLab