Mercurial > hg > orthanc-stone

changeset 1465:70b0b1dc1de4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed useless include_directories
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 12 Jun 2020 10:13:02 +0200
parents 4647636334aa
children 339cd78ff1a2
files Resources/CMake/BoostExtendedConfiguration.cmake Resources/CMake/OrthancStoneConfiguration.cmake Samples/Sdl/RtViewer/CMakeLists.txt Samples/Sdl/SingleFrameViewer/CMakeLists.txt Samples/WebAssembly/CMakeLists.txt Samples/WebAssembly/RtViewer/CMakeLists.txt Samples/WebAssembly/SingleFrameViewer/CMakeLists.txt
diffstat 7 files changed, 6 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/CMake/BoostExtendedConfiguration.cmake	Fri Jun 12 07:20:12 2020 +0200
+++ b/Resources/CMake/BoostExtendedConfiguration.cmake	Fri Jun 12 10:13:02 2020 +0200
@@ -35,5 +35,7 @@
     #${BOOST_SOURCES_DIR}/libs/program_options/src/winmain.cpp
     )
   add_definitions(-DBOOST_PROGRAM_OPTIONS_NO_LIB)
+else()
+  list(APPEND ORTHANC_BOOST_COMPONENTS program_options)
 endif()
 
--- a/Resources/CMake/OrthancStoneConfiguration.cmake	Fri Jun 12 07:20:12 2020 +0200
+++ b/Resources/CMake/OrthancStoneConfiguration.cmake	Fri Jun 12 10:13:02 2020 +0200
@@ -30,6 +30,10 @@
   endif()
 endif()
 
+# "BoostExtendedConfiguration.cmake" *must* be included before
+# "OrthancFrameworkConfiguration.cmake"
+include(${CMAKE_CURRENT_LIST_DIR}/BoostExtendedConfiguration.cmake)
+
 include(${ORTHANC_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake)
 include_directories(
   ${ORTHANC_ROOT}/Core
@@ -92,7 +96,6 @@
 SET(ORTHANC_STONE_ROOT ${CMAKE_CURRENT_LIST_DIR}/../..)
 
 include(FindPkgConfig)
-include(${CMAKE_CURRENT_LIST_DIR}/BoostExtendedConfiguration.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/CairoConfiguration.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/FreetypeConfiguration.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/PixmanConfiguration.cmake)
--- a/Samples/Sdl/RtViewer/CMakeLists.txt	Fri Jun 12 07:20:12 2020 +0200
+++ b/Samples/Sdl/RtViewer/CMakeLists.txt	Fri Jun 12 10:13:02 2020 +0200
@@ -29,9 +29,6 @@
 include(${STONE_ROOT}/Resources/CMake/OrthancStoneConfiguration.cmake)
 include(${STONE_ROOT}/Resources/CMake/Utilities.cmake)
 
-include_directories(${STONE_ROOT})
-include_directories(../../Common)
-
 add_definitions(
   -DORTHANC_ENABLE_LOGGING=1
   -DORTHANC_ENABLE_LOGGING_PLUGIN=0
@@ -53,4 +50,3 @@
   )
 
 target_link_libraries(RtViewerSdl ${DCMTK_LIBRARIES})
-
--- a/Samples/Sdl/SingleFrameViewer/CMakeLists.txt	Fri Jun 12 07:20:12 2020 +0200
+++ b/Samples/Sdl/SingleFrameViewer/CMakeLists.txt	Fri Jun 12 10:13:02 2020 +0200
@@ -19,8 +19,6 @@
 include(${STONE_ROOT}/Resources/CMake/OrthancStoneConfiguration.cmake)
 include(${STONE_ROOT}/Resources/CMake/Utilities.cmake)
 
-include_directories(${STONE_ROOT})
-
 add_definitions(
   -DORTHANC_ENABLE_LOGGING=1
   -DORTHANC_ENABLE_LOGGING_PLUGIN=0
@@ -38,6 +36,5 @@
   ${ORTHANC_STONE_SOURCES}
   )
 
-
 target_link_libraries(SdlSimpleViewer ${DCMTK_LIBRARIES})
 
--- a/Samples/WebAssembly/CMakeLists.txt	Fri Jun 12 07:20:12 2020 +0200
+++ b/Samples/WebAssembly/CMakeLists.txt	Fri Jun 12 10:13:02 2020 +0200
@@ -58,9 +58,6 @@
 # populate the ORTHANC_STONE_SOURCES CMake variable
 include(${STONE_ROOT}/Resources/CMake/OrthancStoneConfiguration.cmake)
 
-include_directories(${STONE_ROOT})
-include_directories(../Common)
-
 add_library(OrthancStone STATIC
   ${ORTHANC_STONE_SOURCES}
   )
--- a/Samples/WebAssembly/RtViewer/CMakeLists.txt	Fri Jun 12 07:20:12 2020 +0200
+++ b/Samples/WebAssembly/RtViewer/CMakeLists.txt	Fri Jun 12 10:13:02 2020 +0200
@@ -58,9 +58,6 @@
 # populate the ORTHANC_STONE_SOURCES CMake variable
 include(${STONE_ROOT}/Resources/CMake/OrthancStoneConfiguration.cmake)
 
-include_directories(${STONE_ROOT})
-include_directories(../../Common)
-
 # Define the WASM module
 # ---------------------------------------------------------------
 add_executable(RtViewerWasm
--- a/Samples/WebAssembly/SingleFrameViewer/CMakeLists.txt	Fri Jun 12 07:20:12 2020 +0200
+++ b/Samples/WebAssembly/SingleFrameViewer/CMakeLists.txt	Fri Jun 12 10:13:02 2020 +0200
@@ -44,8 +44,6 @@
 # populate the ORTHANC_STONE_SOURCES CMake variable
 include(${STONE_ROOT}/Resources/CMake/OrthancStoneConfiguration.cmake)
 
-include_directories(${STONE_ROOT})
-
 # Define the WASM module
 # ---------------------------------------------------------------
 add_executable(SingleFrameViewerWasm