Mercurial > hg > orthanc

changeset 259:6f4591ba5051 Orthanc-0.3.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dcmtk not for the core
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sun, 09 Dec 2012 14:34:02 +0100
parents 098661837a96
children 9e24c33c3361
files CMakeLists.txt Resources/CMake/DcmtkConfiguration.cmake
diffstat 2 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Sun Dec 09 12:14:31 2012 +0100
+++ b/CMakeLists.txt	Sun Dec 09 14:34:02 2012 +0100
@@ -156,6 +156,7 @@
 add_dependencies(ServerLibrary CoreLibrary)
 
 add_executable(Orthanc
+  ${DCMTK_SOURCES}
   OrthancServer/main.cpp
   )
 
--- a/Resources/CMake/DcmtkConfiguration.cmake	Sun Dec 09 12:14:31 2012 +0100
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Sun Dec 09 14:34:02 2012 +0100
@@ -27,24 +27,24 @@
     ${DCMTK_SOURCES_DIR}/CMake/osconfig.h.in
     ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/osconfig.h)
 
-  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmnet/libsrc THIRD_PARTY_SOURCES)
-  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmdata/libsrc THIRD_PARTY_SOURCES)
-  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/ofstd/libsrc THIRD_PARTY_SOURCES)
+  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmnet/libsrc DCMTK_SOURCES)
+  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmdata/libsrc DCMTK_SOURCES)
+  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/ofstd/libsrc DCMTK_SOURCES)
 
   # Source for the logging facility of DCMTK
-  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/oflog/libsrc THIRD_PARTY_SOURCES)
+  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/oflog/libsrc DCMTK_SOURCES)
   if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-    list(REMOVE_ITEM THIRD_PARTY_SOURCES 
+    list(REMOVE_ITEM DCMTK_SOURCES 
       ${DCMTK_SOURCES_DIR}/oflog/libsrc/windebap.cc
       ${DCMTK_SOURCES_DIR}/oflog/libsrc/winsock.cc
       )
   elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-    list(REMOVE_ITEM THIRD_PARTY_SOURCES 
+    list(REMOVE_ITEM DCMTK_SOURCES 
       ${DCMTK_SOURCES_DIR}/oflog/libsrc/unixsock.cc
       )
   endif()
 
-  list(REMOVE_ITEM THIRD_PARTY_SOURCES 
+  list(REMOVE_ITEM DCMTK_SOURCES 
     ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdictbi.cc
     ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc
     ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdictbi.cc