comparison CMakeLists.txt @ 870:f4f5ab513157 jpeg

fix static builds
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 11 Jun 2014 09:13:22 +0200
parents 839be3022203
children 7ebd1a94be9d
comparison
equal deleted inserted replaced
867:ea246626b96c 870:f4f5ab513157
307 307
308 add_executable(Orthanc 308 add_executable(Orthanc
309 OrthancServer/main.cpp 309 OrthancServer/main.cpp
310 ) 310 )
311 311
312 target_link_libraries(Orthanc ServerLibrary CoreLibrary) 312 target_link_libraries(Orthanc ServerLibrary CoreLibrary ${STATIC_LUA} ${STATIC_GOOGLE_LOG})
313 313
314 if (${OPENSSL_SOURCES_LENGTH} GREATER 0) 314 if (${OPENSSL_SOURCES_LENGTH} GREATER 0)
315 target_link_libraries(Orthanc OpenSSL) 315 target_link_libraries(Orthanc OpenSSL)
316 endif() 316 endif()
317 317
336 include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleTestConfiguration.cmake) 336 include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleTestConfiguration.cmake)
337 add_executable(UnitTests 337 add_executable(UnitTests
338 ${GTEST_SOURCES} 338 ${GTEST_SOURCES}
339 ${ORTHANC_UNIT_TESTS_SOURCES} 339 ${ORTHANC_UNIT_TESTS_SOURCES}
340 ) 340 )
341 target_link_libraries(UnitTests ServerLibrary CoreLibrary) 341 target_link_libraries(UnitTests ServerLibrary CoreLibrary ${STATIC_LUA} ${STATIC_GOOGLE_LOG})
342 342
343 if (${OPENSSL_SOURCES_LENGTH} GREATER 0) 343 if (${OPENSSL_SOURCES_LENGTH} GREATER 0)
344 target_link_libraries(UnitTests OpenSSL) 344 target_link_libraries(UnitTests OpenSSL)
345 endif() 345 endif()
346 346
388 ${ORTHANC_ROOT}/Resources/md5/md5.c 388 ${ORTHANC_ROOT}/Resources/md5/md5.c
389 ${ORTHANC_ROOT}/Resources/base64/base64.cpp 389 ${ORTHANC_ROOT}/Resources/base64/base64.cpp
390 ${ORTHANC_CPP_CLIENT_AUX} 390 ${ORTHANC_CPP_CLIENT_AUX}
391 ${THIRD_PARTY_SOURCES} 391 ${THIRD_PARTY_SOURCES}
392 ${CURL_SOURCES} 392 ${CURL_SOURCES}
393 ${GOOGLE_LOG_SOURCES}
393 ) 394 )
394 395
395 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") 396 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
396 set_target_properties(OrthancClient 397 set_target_properties(OrthancClient
397 PROPERTIES LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined -Wl,--as-needed -Wl,--version-script=${ORTHANC_ROOT}/OrthancCppClient/SharedLibrary/Laaw/VersionScript.map" 398 PROPERTIES LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined -Wl,--as-needed -Wl,--version-script=${ORTHANC_ROOT}/OrthancCppClient/SharedLibrary/Laaw/VersionScript.map"