From 8f03b31d02129e2130e776d43bd151e294365df1 Mon Sep 17 00:00:00 2001 From: Frank Ueberschar Date: Mon, 10 Sep 2018 14:30:59 +0200 Subject: [PATCH] windows: use bareoscfg import library only when building for windows --- core/src/lib/bareos/CMakeLists.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/core/src/lib/bareos/CMakeLists.txt b/core/src/lib/bareos/CMakeLists.txt index 25a28b28c02..2d9febaa4c4 100644 --- a/core/src/lib/bareos/CMakeLists.txt +++ b/core/src/lib/bareos/CMakeLists.txt @@ -52,6 +52,7 @@ IF(HAVE_WIN32) ../../win32/compat/print.cc ../../win32/compat/winapi.cc ) + set(BAREOSCFG_IMPORT_LIB bareoscfg_import_a) ELSE() LIST(APPEND BAREOS_SRCS scsi_tapealert.cc) @@ -63,23 +64,22 @@ add_library(bareos SHARED ${BAREOS_SRCS}) target_link_libraries(bareos ${OPENSSL_LIBRARIES} ${PTHREAD_LIBRARIES} ${FASTLZ_LIBRARIES} ${ZLIB_LIBRARIES} ${ACL_LIBRARIES} ${LZO2_LIBRARIES} ${CAP_LIBRARIES} ${WRAP_LIBRARIES} ${CAM_LIBRARIES} - ${WINDOWS_LIBRARIES} ${JANSSON_LIBRARIES} bareoscfg_import_a) + ${WINDOWS_LIBRARIES} ${JANSSON_LIBRARIES} ${BAREOSCFG_IMPORT_LIB}) INSTALL(TARGETS bareos DESTINATION ${libdir}) set_target_properties(bareos PROPERTIES VERSION "${VERSION}" SOVERSION "${SOVERSION}") -ADD_CUSTOM_COMMAND( - PRE_LINK - TARGET bareos - DEPENDS libbareoscfg.def - COMMAND x86_64-w64-mingw32-dlltool -d ${CMAKE_CURRENT_SOURCE_DIR}/libbareoscfg.def -l libbareoscfg_import_a - COMMAND echo ${CMAKE_CURRENT_BINARY_DIR} - COMMAND cp libbareoscfg_import_a ${WINDOWS_IMPORT_LIB_DIRECTORY}/libbareoscfg_import_a.a -) - IF(HAVE_WIN32) + ADD_CUSTOM_COMMAND( + PRE_LINK + TARGET bareos + DEPENDS libbareoscfg.def + COMMAND x86_64-w64-mingw32-dlltool -d ${CMAKE_CURRENT_SOURCE_DIR}/libbareoscfg.def -l libbareoscfg_import_a + COMMAND echo ${CMAKE_CURRENT_BINARY_DIR} + COMMAND cp libbareoscfg_import_a ${WINDOWS_IMPORT_LIB_DIRECTORY}/libbareoscfg_import_a.a) + set_target_properties(bareos PROPERTIES DEFINE_SYMBOL "BUILDING_BAREOS_DLL") ENDIF()