# HG changeset patch # User Sebastien Jodogne # Date 1355060042 -3600 # Node ID 6f4591ba505198f5be1b3aba442f4ae35f2da6f7 # Parent 098661837a964f03c4593df264fc1cb8995a25d6 dcmtk not for the core diff -r 098661837a96 -r 6f4591ba5051 CMakeLists.txt --- 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 ) diff -r 098661837a96 -r 6f4591ba5051 Resources/CMake/DcmtkConfiguration.cmake --- 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