Mercurial > hg > orthanc

changeset 2035:9dd1ee869b88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 21 Jun 2016 13:28:16 +0200
parents 07f2ba3677df
children 99e70e9b05ad
files CMakeLists.txt Resources/Samples/Tools/RecoverCompressedFile.cpp
diffstat 2 files changed, 21 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Tue Jun 21 12:58:25 2016 +0200
+++ b/CMakeLists.txt	Tue Jun 21 13:28:16 2016 +0200
@@ -588,6 +588,10 @@
     SOVERSION ${ORTHANC_VERSION}
     )
 
+  set_source_files_properties(${ORTHANC_ALL_SOURCES}
+    PROPERTIES COMPILE_FLAGS -pedantic
+    )
+
   install(
     TARGETS ModalityWorklists
     RUNTIME DESTINATION lib    # Destination for Windows
@@ -604,6 +608,21 @@
 if (BUILD_RECOVER_COMPRESSED_FILE)
   set(RECOVER_COMPRESSED_SOURCES
     Resources/Samples/Tools/RecoverCompressedFile.cpp
+
+    ${CMAKE_SOURCE_DIR}/Core/ChunkedBuffer.cpp
+    ${CMAKE_SOURCE_DIR}/Core/Compression/DeflateBaseCompressor.cpp
+    ${CMAKE_SOURCE_DIR}/Core/Compression/ZlibCompressor.cpp
+    ${CMAKE_SOURCE_DIR}/Core/Enumerations.cpp
+    ${CMAKE_SOURCE_DIR}/Core/Logging.cpp
+    ${CMAKE_SOURCE_DIR}/Core/Toolbox.cpp
+    ${CMAKE_SOURCE_DIR}/Resources/ThirdParty/base64/base64.cpp
+    ${CMAKE_SOURCE_DIR}/Resources/ThirdParty/md5/md5.c
+
+    ${BOOST_SOURCES}
+    ${JSONCPP_SOURCES}
+    ${PUGIXML_SOURCES}
+    ${RECOVER_COMPRESSED_SOURCES}
+    ${ZLIB_SOURCES}
     )
 
   if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
@@ -625,21 +644,7 @@
       )
   endif()
 
-  add_executable(OrthancRecoverCompressedFile
-    ${RECOVER_COMPRESSED_SOURCES}
-    ${ZLIB_SOURCES}
-    ${BOOST_SOURCES}
-    ${JSONCPP_SOURCES}
-    ${PUGIXML_SOURCES}
-    ${CMAKE_SOURCE_DIR}/Core/ChunkedBuffer.cpp
-    ${CMAKE_SOURCE_DIR}/Core/Logging.cpp
-    ${CMAKE_SOURCE_DIR}/Core/Enumerations.cpp
-    ${CMAKE_SOURCE_DIR}/Core/Toolbox.cpp
-    ${CMAKE_SOURCE_DIR}/Core/Compression/DeflateBaseCompressor.cpp
-    ${CMAKE_SOURCE_DIR}/Core/Compression/ZlibCompressor.cpp
-    ${CMAKE_SOURCE_DIR}/Resources/ThirdParty/md5/md5.c
-    ${CMAKE_SOURCE_DIR}/Resources/ThirdParty/base64/base64.cpp
-    )
+  add_executable(OrthancRecoverCompressedFile ${RECOVER_COMPRESSED_SOURCES})
 
   install(
     TARGETS OrthancRecoverCompressedFile
--- a/Resources/Samples/Tools/RecoverCompressedFile.cpp	Tue Jun 21 12:58:25 2016 +0200
+++ b/Resources/Samples/Tools/RecoverCompressedFile.cpp	Tue Jun 21 13:28:16 2016 +0200
@@ -18,6 +18,7 @@
  **/
 
 
+#include "../../../Core/PrecompiledHeaders.h"
 #include "../../../Core/Compression/ZlibCompressor.h"
 #include "../../../Core/Toolbox.h"
 #include "../../../Core/OrthancException.h"