From 9caec622516ab0332d0a52290f6c38692b9cdd17 Mon Sep 17 00:00:00 2001 From: Volodymyr Vovchenko Date: Thu, 18 Jul 2019 22:49:30 +0200 Subject: [PATCH] Fixed for shared library mode --- src/library/CMakeLists.txt | 6 +++--- thirdparty/Minuit2/CMakeLists.txt | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt index a1f82df..e1cc1c0 100644 --- a/src/library/CMakeLists.txt +++ b/src/library/CMakeLists.txt @@ -1,5 +1,5 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") - +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") # Properties->C/C++->General->Additional Include Directories include_directories ("${PROJECT_SOURCE_DIR}/include" @@ -154,7 +154,7 @@ target_include_directories(ThermalFIST PUBLIC "${PROJECT_BINARY_DIR}/include" "${PROJECT_SOURCE_DIR}/thirdparty/MersenneTwister") -install (TARGETS ThermalFIST - ARCHIVE DESTINATION ${PROJECT_BINARY_DIR}/lib) +#install (TARGETS ThermalFIST +# ARCHIVE DESTINATION ${PROJECT_BINARY_DIR}/lib) diff --git a/thirdparty/Minuit2/CMakeLists.txt b/thirdparty/Minuit2/CMakeLists.txt index 230cc85..5409eeb 100644 --- a/thirdparty/Minuit2/CMakeLists.txt +++ b/thirdparty/Minuit2/CMakeLists.txt @@ -1,4 +1,5 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") # Minuit2 headers file (GLOB HEADERS_MINUIT @@ -18,7 +19,7 @@ target_include_directories(Minuit2 PUBLIC "Minuit/include") set_property(TARGET Minuit2 PROPERTY FOLDER "libraries") -install (TARGETS Minuit2 - ARCHIVE DESTINATION ${PROJECT_BINARY_DIR}/lib) +#install (TARGETS Minuit2 +# ARCHIVE DESTINATION ${PROJECT_BINARY_DIR}/lib)