From 49a6e9389d0f888906ad3ba1fd915c0d56c98b58 Mon Sep 17 00:00:00 2001 From: Dennis Klein Date: Wed, 19 Sep 2018 18:19:55 +0200 Subject: [PATCH] Support BUILD_SHARED_LIBS cmake variable --- CMakeLists.txt | 3 ++- cmake/FairLoggerLib.cmake | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6cd7c91..99ce97a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ configure_file(logger/Version.h.in @ONLY ) -add_library(FairLogger SHARED +add_library(FairLogger logger/Logger.cxx logger/Logger.h ) @@ -64,6 +64,7 @@ install(TARGETS EXPORT ${FairLogger_EXPORT_SET} LIBRARY DESTINATION ${FairLogger_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${FairLogger_INSTALL_LIBDIR} RUNTIME DESTINATION ${FairLogger_INSTALL_BINDIR} ) diff --git a/cmake/FairLoggerLib.cmake b/cmake/FairLoggerLib.cmake index e8ea3b4..f88e11e 100644 --- a/cmake/FairLoggerLib.cmake +++ b/cmake/FairLoggerLib.cmake @@ -125,6 +125,10 @@ macro(set_fairlogger_defaults) # Generate compile_commands.json file (https://clang.llvm.org/docs/JSONCompilationDatabase.html) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + if(NOT BUILD_SHARED_LIBS) + set(BUILD_SHARED_LIBS ON CACHE BOOL "Whether to build shared libraries or static archives") + endif() + # Define CMAKE_INSTALL_*DIR family of variables include(GNUInstallDirs)