Mercurial > hg > orthanc
changeset 1057:3a26bc6e4867
more generic paths in CMake
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 25 Jul 2014 10:12:16 +0200 |
| parents | 03c738276a04 |
| children | a098cf3bef24 |
| files | Resources/CMake/Compiler.cmake Resources/CMake/DcmtkConfiguration.cmake Resources/CMake/MongooseConfiguration.cmake Resources/CMake/OpenSslConfiguration.cmake Resources/CMake/PlustacheConfiguration.cmake |
| diffstat | 5 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Resources/CMake/Compiler.cmake Thu Jul 24 11:41:15 2014 +0200 +++ b/Resources/CMake/Compiler.cmake Fri Jul 25 10:12:16 2014 +0200 @@ -32,7 +32,7 @@ -D_CRT_SECURE_NO_WARNINGS=1 -D_CRT_SECURE_NO_DEPRECATE=1 ) - include_directories(${CMAKE_SOURCE_DIR}/Resources/ThirdParty/VisualStudio) + include_directories(${ORTHANC_ROOT}/Resources/ThirdParty/VisualStudio) link_libraries(netapi32) endif()
--- a/Resources/CMake/DcmtkConfiguration.cmake Thu Jul 24 11:41:15 2014 +0200 +++ b/Resources/CMake/DcmtkConfiguration.cmake Fri Jul 25 10:12:16 2014 +0200 @@ -101,7 +101,7 @@ if (${CMAKE_COMPILER_IS_GNUCXX}) # This is a patch for MinGW64 execute_process( - COMMAND patch -p0 -i ${CMAKE_SOURCE_DIR}/Resources/Patches/dcmtk-mingw64.patch + COMMAND patch -p0 -i ${ORTHANC_ROOT}/Resources/Patches/dcmtk-mingw64.patch WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) endif()
--- a/Resources/CMake/MongooseConfiguration.cmake Thu Jul 24 11:41:15 2014 +0200 +++ b/Resources/CMake/MongooseConfiguration.cmake Fri Jul 25 10:12:16 2014 +0200 @@ -7,7 +7,7 @@ # Patch mongoose execute_process( - COMMAND patch mongoose.c ${CMAKE_SOURCE_DIR}/Resources/Patches/mongoose-patch.diff + COMMAND patch mongoose.c ${ORTHANC_ROOT}/Resources/Patches/mongoose-patch.diff WORKING_DIRECTORY ${MONGOOSE_SOURCES_DIR} )
--- a/Resources/CMake/OpenSslConfiguration.cmake Thu Jul 24 11:41:15 2014 +0200 +++ b/Resources/CMake/OpenSslConfiguration.cmake Fri Jul 25 10:12:16 2014 +0200 @@ -188,7 +188,7 @@ elseif ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") execute_process( - COMMAND patch ui_openssl.c ${CMAKE_SOURCE_DIR}/Resources/Patches/openssl-lsb.diff + COMMAND patch ui_openssl.c ${ORTHANC_ROOT}/Resources/Patches/openssl-lsb.diff WORKING_DIRECTORY ${OPENSSL_SOURCES_DIR}/crypto/ui )
--- a/Resources/CMake/PlustacheConfiguration.cmake Thu Jul 24 11:41:15 2014 +0200 +++ b/Resources/CMake/PlustacheConfiguration.cmake Fri Jul 25 10:12:16 2014 +0200 @@ -18,7 +18,7 @@ ) execute_process( - COMMAND patch -p0 -i ${CMAKE_SOURCE_DIR}/Resources/CMake/PlustacheConfiguration.patch + COMMAND patch -p0 -i ${ORTHANC_ROOT}/Resources/CMake/PlustacheConfiguration.patch WORKING_DIRECTORY ${CMAKE_BINARY_DIR} )