Different location of installed libraries for Windows and Linux

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

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)

README

@@ -8,3 +8,4 @@ changelog    :  see Doc/CHANGELOG
 
 
 
+

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)