comparison CMakeLists.txt @ 954:a91e7b4080d1 lua-scripting

merge mainline -> lua-scripting
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 25 Jun 2014 15:36:01 +0200
parents 394a19d44f9d 8811abd6aec9
children b3d4f8a30324
comparison
equal deleted inserted replaced
946:394a19d44f9d 954:a91e7b4080d1
187 SET(STANDALONE_BUILD ON) 187 SET(STANDALONE_BUILD ON)
188 endif() 188 endif()
189 189
190 # Prepare the third-party dependencies 190 # Prepare the third-party dependencies
191 SET(THIRD_PARTY_SOURCES 191 SET(THIRD_PARTY_SOURCES
192 ${CMAKE_SOURCE_DIR}/Resources/md5/md5.c 192 ${CMAKE_SOURCE_DIR}/Resources/ThirdParty/md5/md5.c
193 ${CMAKE_SOURCE_DIR}/Resources/base64/base64.cpp 193 ${CMAKE_SOURCE_DIR}/Resources/ThirdParty/base64/base64.cpp
194 ) 194 )
195 195
196 include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleLogConfiguration.cmake) 196 include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleLogConfiguration.cmake)
197 include(${CMAKE_SOURCE_DIR}/Resources/CMake/BoostConfiguration.cmake) 197 include(${CMAKE_SOURCE_DIR}/Resources/CMake/BoostConfiguration.cmake)
198 include(${CMAKE_SOURCE_DIR}/Resources/CMake/DcmtkConfiguration.cmake) 198 include(${CMAKE_SOURCE_DIR}/Resources/CMake/DcmtkConfiguration.cmake)
389 endif() 389 endif()
390 390
391 add_library(OrthancClient SHARED 391 add_library(OrthancClient SHARED
392 ${ORTHANC_ROOT}/OrthancCppClient/OrthancCppClient.cpp 392 ${ORTHANC_ROOT}/OrthancCppClient/OrthancCppClient.cpp
393 ${ORTHANC_ROOT}/OrthancCppClient/SharedLibrary/SharedLibrary.cpp 393 ${ORTHANC_ROOT}/OrthancCppClient/SharedLibrary/SharedLibrary.cpp
394 ${ORTHANC_ROOT}/Resources/md5/md5.c 394 ${ORTHANC_ROOT}/Resources/ThirdParty/md5/md5.c
395 ${ORTHANC_ROOT}/Resources/base64/base64.cpp 395 ${ORTHANC_ROOT}/Resources/ThirdParty/base64/base64.cpp
396 ${ORTHANC_CPP_CLIENT_AUX} 396 ${ORTHANC_CPP_CLIENT_AUX}
397 ${THIRD_PARTY_SOURCES} 397 ${THIRD_PARTY_SOURCES}
398 ${CURL_SOURCES} 398 ${CURL_SOURCES}
399 ${GOOGLE_LOG_SOURCES} 399 ${GOOGLE_LOG_SOURCES}
400 ) 400 )