From 5dca65946a01d8bdddea35bbc3257bdfe85ddf33 Mon Sep 17 00:00:00 2001 From: Vlad Glagolev Date: Sun, 28 Jan 2018 15:23:23 -0500 Subject: [PATCH] Fix encfs build with BUILD_SHARED_LIBS=1 (#463) * Fix build against tinyxml2 with BUILD_SHARED_LIBS=1 * Force building static easyloggingpp till upstream adds shared support --- CMakeLists.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d1577c3..0cab3cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -206,15 +206,16 @@ if (USE_INTERNAL_TINYXML) if (BUILD_SHARED_LIBS) set(BUILD_STATIC_LIBS OFF CACHE BOOL "build static libs") set(BUILD_SHARED_LIBS ON CACHE BOOL "build shared libs") + set(TINYXML_LIBRARIES tinyxml2) else () set(BUILD_STATIC_LIBS ON CACHE BOOL "build static libs") set(BUILD_SHARED_LIBS OFF CACHE BOOL "build shared libs") + set(TINYXML_LIBRARIES tinyxml2_static) endif () set(BUILD_TESTS OFF CACHE BOOL "build tests") add_subdirectory(${TINYXML_DIR} EXCLUDE_FROM_ALL) include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/${TINYXML_DIR}) link_directories(${CMAKE_BINARY_DIR}/${TINYXML_DIR}) - set(TINYXML_LIBRARIES tinyxml2_static) else () find_package (TinyXML REQUIRED) include_directories (SYSTEM ${TINYXML_INCLUDE_DIR}) @@ -223,11 +224,7 @@ endif () if (USE_INTERNAL_EASYLOGGING) message("-- Using vendored Easylogging++") set(EASYLOGGING_DIR vendor/github.com/muflihun/easyloggingpp) - if (BUILD_SHARED_LIBS) - set(build_static_lib OFF CACHE BOOL "build static libs") - else () - set(build_static_lib ON CACHE BOOL "build static libs") - endif () + set(build_static_lib ON CACHE BOOL "build static libs") add_subdirectory(${EASYLOGGING_DIR} EXCLUDE_FROM_ALL) include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/${EASYLOGGING_DIR}/src) link_directories(${CMAKE_BINARY_DIR}/${EASYLOGGING_DIR})