Mercurial > hg > orthanc-webviewer
changeset 13:09421764214b
fixes for visual studio
| author | jodogne |
|---|---|
| date | Wed, 01 Apr 2015 13:20:45 +0200 |
| parents | 379131283479 |
| children | 4055926187d3 |
| files | CMakeLists.txt Orthanc/FileStorage/FilesystemStorage.h Orthanc/SQLite/StatementReference.cpp Resources/CMake/GdcmConfiguration.cmake UnitTestsSources/UnitTestsMain.cpp |
| diffstat | 5 files changed, 36 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Wed Mar 11 14:23:24 2015 +0100 +++ b/CMakeLists.txt Wed Apr 01 13:20:45 2015 +0200 @@ -18,7 +18,7 @@ cmake_minimum_required(VERSION 2.8) -project(OrthancPostgreSQL) +project(OrthancWebViewer) set(ORTHANC_WEBVIEWER_VERSION "1.0") @@ -64,6 +64,25 @@ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script=${CMAKE_SOURCE_DIR}/Resources/VersionScript.map -Wl,--no-undefined") endif() +if (MSVC) + # Use static runtime under Visual Studio + # http://www.cmake.org/Wiki/CMake_FAQ#Dynamic_Replace + # http://stackoverflow.com/a/6510446 + foreach(flag_var + CMAKE_C_FLAGS_DEBUG + CMAKE_CXX_FLAGS_DEBUG + CMAKE_C_FLAGS_RELEASE + CMAKE_CXX_FLAGS_RELEASE + CMAKE_C_FLAGS_MINSIZEREL + CMAKE_CXX_FLAGS_MINSIZEREL + CMAKE_C_FLAGS_RELWITHDEBINFO + CMAKE_CXX_FLAGS_RELWITHDEBINFO) + string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") + string(REGEX REPLACE "/MDd" "/MTd" ${flag_var} "${${flag_var}}") + endforeach(flag_var) + + add_definitions(-D_CRT_SECURE_NO_WARNINGS=1) +endif() include(CheckIncludeFiles) include(CheckIncludeFileCXX)
--- a/Orthanc/FileStorage/FilesystemStorage.h Wed Mar 11 14:23:24 2015 +0100 +++ b/Orthanc/FileStorage/FilesystemStorage.h Wed Apr 01 13:20:45 2015 +0200 @@ -34,6 +34,7 @@ #include <boost/filesystem.hpp> #include <set> +#include <stdint.h> namespace Orthanc {
--- a/Orthanc/SQLite/StatementReference.cpp Wed Mar 11 14:23:24 2015 +0100 +++ b/Orthanc/SQLite/StatementReference.cpp Wed Apr 01 13:20:45 2015 +0200 @@ -47,6 +47,7 @@ #endif #include <cassert> +#include <string> #include "sqlite3.h" namespace Orthanc
--- a/Resources/CMake/GdcmConfiguration.cmake Wed Mar 11 14:23:24 2015 +0100 +++ b/Resources/CMake/GdcmConfiguration.cmake Wed Apr 01 13:20:45 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) @@ -39,11 +49,12 @@ if(MSVC) set(Suffix ".lib") + set(Prefix "") else() set(Suffix ".a") + list(GET CMAKE_FIND_LIBRARY_PREFIXES 0 Prefix) endif() - list(GET CMAKE_FIND_LIBRARY_PREFIXES 0 Prefix) set(GDCM_LIBRARIES ${Prefix}gdcmMSFF${Suffix} ${Prefix}gdcmcharls${Suffix}
--- a/UnitTestsSources/UnitTestsMain.cpp Wed Mar 11 14:23:24 2015 +0100 +++ b/UnitTestsSources/UnitTestsMain.cpp Wed Apr 01 13:20:45 2015 +0200 @@ -193,10 +193,10 @@ { Orthanc::ImageBuffer img(16, 16, Orthanc::PixelFormat_Grayscale8); Orthanc::ImageAccessor accessor = img.GetAccessor(); - for (int y = 0, value = 0; y < img.GetHeight(); y++) + for (unsigned int y = 0, value = 0; y < img.GetHeight(); y++) { uint8_t* p = reinterpret_cast<uint8_t*>(accessor.GetRow(y)); - for (int x = 0; x < img.GetWidth(); x++, p++) + for (unsigned int x = 0; x < img.GetWidth(); x++, p++) { *p = value++; }