From eb914a23fecf5ffdc316c0f8f396b17149700ae8 Mon Sep 17 00:00:00 2001
From: Gerardo Tauriello <gerardo.tauriello@unibas.ch>
Date: Mon, 12 Aug 2019 15:49:06 +0200
Subject: [PATCH] SCHWED-4355: Fixes for static compile
Tested with Ubuntu 18.04 (in a vagrant box) following instructions in doc and
adding cmake flags "-DENABLE_STATIC=ON -DENABLE_INFO=OFF". Tested resulting
binaries "chemdict_tool" and "lddt" in Ubuntu-box and host-system (CentOS 7).
---
cmake_support/OST.cmake | 14 +++++++-------
modules/db/src/CMakeLists.txt | 4 +++-
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/cmake_support/OST.cmake b/cmake_support/OST.cmake
index 8fab0b359..31c304804 100644
--- a/cmake_support/OST.cmake
+++ b/cmake_support/OST.cmake
@@ -321,15 +321,15 @@ macro(executable)
if (ENABLE_STATIC AND _ARG_STATIC)
target_link_libraries(${_ARG_NAME} ${STATIC_LIBRARIES})
if (UNIX AND NOT APPLE)
+ set_target_properties(${_ARG_NAME} PROPERTIES LINK_SEARCH_START_STATIC TRUE)
+ set_target_properties(${_ARG_NAME} PROPERTIES LINK_SEARCH_END_STATIC TRUE)
if (OST_GCC_LESS_45)
- set_target_properties(${_ARG_NAME}
- PROPERTIES LINK_SEARCH_END_STATIC TRUE
- LINK_FLAGS "-static-libgcc -static -pthread")
+ set_target_properties(${_ARG_NAME} PROPERTIES LINK_FLAGS
+ "-static-libgcc -static -pthread")
else()
- set_target_properties(${_ARG_NAME}
- PROPERTIES LINK_SEARCH_END_STATIC TRUE
- LINK_FLAGS "-static-libgcc -static-libstdc++ -static -pthread")
- endif()
+ set_target_properties(${_ARG_NAME} PROPERTIES LINK_FLAGS
+ "-static-libgcc -static-libstdc++ -static -pthread")
+ endif()
endif()
endif()
install(TARGETS ${_ARG_NAME} DESTINATION bin)
diff --git a/modules/db/src/CMakeLists.txt b/modules/db/src/CMakeLists.txt
index 8c536297f..8b59de092 100644
--- a/modules/db/src/CMakeLists.txt
+++ b/modules/db/src/CMakeLists.txt
@@ -23,4 +23,6 @@ if(WIN32)
else(WIN32)
add_definitions(-DSQLITE_OMIT_LOAD_EXTENSION)
endif(WIN32)
-
+if (ENABLE_STATIC AND UNIX AND NOT APPLE)
+ target_link_libraries(ost_db ${CMAKE_DL_LIBS})
+endif()
--
GitLab