Mercurial > hg > orthanc

changeset 873:fc34356283e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration jpeg -> mainline
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 11 Jun 2014 09:18:07 +0200
parents d256f69e6391 (current diff) 7ebd1a94be9d (diff)
children 87791ebc1f50
files
diffstat 4 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Tue Jun 10 17:55:38 2014 +0200
+++ b/CMakeLists.txt	Wed Jun 11 09:18:07 2014 +0200
@@ -309,7 +309,7 @@
   OrthancServer/main.cpp
   )
 
-target_link_libraries(Orthanc ServerLibrary CoreLibrary)
+target_link_libraries(Orthanc ServerLibrary CoreLibrary ${STATIC_LUA} ${STATIC_GOOGLE_LOG})
 
 if (${OPENSSL_SOURCES_LENGTH} GREATER 0)
   target_link_libraries(Orthanc OpenSSL)
@@ -338,7 +338,7 @@
   ${GTEST_SOURCES}
   ${ORTHANC_UNIT_TESTS_SOURCES}
   )
-target_link_libraries(UnitTests ServerLibrary CoreLibrary)
+target_link_libraries(UnitTests ServerLibrary CoreLibrary ${STATIC_LUA} ${STATIC_GOOGLE_LOG})
 
 if (${OPENSSL_SOURCES_LENGTH} GREATER 0)
   target_link_libraries(UnitTests OpenSSL)
@@ -385,11 +385,13 @@
 
   add_library(OrthancClient SHARED
     ${ORTHANC_ROOT}/OrthancCppClient/OrthancCppClient.cpp
+    ${ORTHANC_ROOT}/OrthancCppClient/SharedLibrary/SharedLibrary.cpp
     ${ORTHANC_ROOT}/Resources/md5/md5.c
     ${ORTHANC_ROOT}/Resources/base64/base64.cpp
     ${ORTHANC_CPP_CLIENT_AUX}
     ${THIRD_PARTY_SOURCES}
     ${CURL_SOURCES}
+    ${GOOGLE_LOG_SOURCES}
     )
 
   if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
--- a/INSTALL	Tue Jun 10 17:55:38 2014 +0200
+++ b/INSTALL	Wed Jun 11 09:18:07 2014 +0200
@@ -71,7 +71,7 @@
 the following command:
 
 # cd ~/OrthancBuild
-# cmake -DCMAKE_TOOLCHAIN_FILE=~/Orthanc/Resources/MinGWToolchain.cmake -DSTANDALONE_BUILD=ON -DCMAKE_BUILD_TYPE=Debug ~/Orthanc
+# cmake -DCMAKE_TOOLCHAIN_FILE=~/Orthanc/Resources/MinGWToolchain.cmake -DSTATIC_BUILD=ON -DSTANDALONE_BUILD=ON -DCMAKE_BUILD_TYPE=Debug ~/Orthanc
 # make
 
 
--- a/Resources/CMake/GoogleLogConfiguration.cmake	Tue Jun 10 17:55:38 2014 +0200
+++ b/Resources/CMake/GoogleLogConfiguration.cmake	Wed Jun 11 09:18:07 2014 +0200
@@ -130,13 +130,10 @@
       # This is a patch for MinGW64
       add_definitions(-D_TIME_H__S=1)
     endif()
-
   endif()
- 
-
 
   add_library(GoogleLog STATIC ${GOOGLE_LOG_SOURCES})
-  link_libraries(GoogleLog)
+  set(STATIC_GOOGLE_LOG GoogleLog)
 
 else()
   CHECK_INCLUDE_FILE_CXX(glog/logging.h HAVE_GOOGLE_LOG_H)
--- a/Resources/CMake/LuaConfiguration.cmake	Tue Jun 10 17:55:38 2014 +0200
+++ b/Resources/CMake/LuaConfiguration.cmake	Wed Jun 11 09:18:07 2014 +0200
@@ -51,7 +51,7 @@
     )
 
   add_library(Lua STATIC ${LUA_SOURCES})
-  link_libraries(Lua)
+  set(STATIC_LUA Lua)
 
   source_group(ThirdParty\\Lua REGULAR_EXPRESSION ${LUA_SOURCES_DIR}/.*)