Mercurial > hg > orthanc-dicomweb
changeset 10:adeb17b58431
merge
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 07 Apr 2015 16:11:00 +0200 |
| parents | 8ea0fdd0bf16 (current diff) 8183253effb9 (diff) |
| children | 177d23fbeffa |
| files | CMakeLists.txt |
| diffstat | 3 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Tue Apr 07 16:09:20 2015 +0200 +++ b/CMakeLists.txt Tue Apr 07 16:11:00 2015 +0200 @@ -18,7 +18,7 @@ cmake_minimum_required(VERSION 2.8) -project(OrthancPostgreSQL) +project(OrthancDicomWeb) set(ORTHANC_DICOM_WEB_VERSION "1.0") @@ -38,6 +38,7 @@ set(USE_GTEST_DEBIAN_SOURCE_PACKAGE OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (Debian only)") mark_as_advanced(USE_GTEST_DEBIAN_SOURCE_PACKAGE) + include(CheckIncludeFiles) include(CheckIncludeFileCXX) include(CheckLibraryExists)
--- a/NEWS Tue Apr 07 16:09:20 2015 +0200 +++ b/NEWS Tue Apr 07 16:11:00 2015 +0200 @@ -3,6 +3,7 @@ No official release yet. Still work in progress. +* Support of Visual Studio 2008 2015/03/13
--- a/Resources/CMake/GdcmConfiguration.cmake Tue Apr 07 16:09:20 2015 +0200 +++ b/Resources/CMake/GdcmConfiguration.cmake Tue Apr 07 16:11:00 2015 +0200 @@ -22,6 +22,16 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") set(Flags -DCMAKE_CXX_FLAGS:STRING=-fPIC -DCMAKE_C_FLAGS:STRING=-fPIC) else() + set(Flags + -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG} + -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} + -DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE} + -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} + -DCMAKE_C_FLAGS_MINSIZEREL=${CMAKE_C_FLAGS_MINSIZEREL} + -DCMAKE_CXX_FLAGS_MINSIZEREL=${CMAKE_CXX_FLAGS_MINSIZEREL} + -DCMAKE_C_FLAGS_RELWITHDEBINFO=${CMAKE_C_FLAGS_RELWITHDEBINFO} + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO} + ) endif() if (CMAKE_TOOLCHAIN_FILE) @@ -38,12 +48,13 @@ ) if(MSVC) + set(Prefix "") set(Suffix ".lib") else() + list(GET CMAKE_FIND_LIBRARY_PREFIXES 0 Prefix) set(Suffix ".a") endif() - list(GET CMAKE_FIND_LIBRARY_PREFIXES 0 Prefix) set(GDCM_LIBRARIES ${Prefix}gdcmMSFF${Suffix} ${Prefix}gdcmcharls${Suffix}