#2536 Build System : Add target_include_directories to boost-Subset

ThirdParty/NRLib/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 2.8.12)
 
 project (NRLib)
 
@@ -6,8 +6,6 @@ include_directories(
        ${CMAKE_CURRENT_SOURCE_DIR}
        ${CMAKE_CURRENT_SOURCE_DIR}/nrlib
        ${CMAKE_CURRENT_SOURCE_DIR}/nrlib/well
-
-      ${boost-Subset_SOURCE_DIR}
 )
 
 file ( GLOB NRLIB_IOTOOLS_SRC
@@ -32,3 +30,11 @@ endif()
 
 add_subdirectory(well_UnitTests)
 
+target_include_directories(${PROJECT_NAME}
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/nrlib/well
+)
+
+target_link_libraries ( ${PROJECT_NAME}
+  boost-Subset
+)

ThirdParty/NRLib/well_UnitTests/CMakeLists.txt

@@ -7,8 +7,6 @@ include_directories (
 	${CMAKE_CURRENT_SOURCE_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}/..
 	${CMAKE_CURRENT_SOURCE_DIR}/../..
-
-    ${NR_well_SOURCE_DIR}
 )
 
 set( PROJECT_FILES
@@ -28,6 +26,5 @@ source_group("" FILES ${PROJECT_FILES})
 
 target_link_libraries ( ${PROJECT_NAME}
     NRLib
-    boost-Subset
 )
 

ThirdParty/boost-Subset/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8) 
+cmake_minimum_required (VERSION 2.8.12) 
 
 # Procedure used to extract subset from complete Boost installation
 #
@@ -36,3 +36,8 @@ add_library( ${PROJECT_NAME}
 if (MSVC)
     set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4244")
 endif()
+
+target_include_directories(${PROJECT_NAME}
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)

ThirdParty/custom-opm-flowdiag-app/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 2.8.12)
 
 project (custom-opm-flowdiag-app)
 
@@ -6,7 +6,6 @@ include_directories(
     ../custom-opm-flowdiagnostics/opm-flowdiagnostics
     opm-flowdiagnostics-applications
 	opmCore
-    ${boost-Subset_SOURCE_DIR}
 )
 
 include (opm-flowdiagnostics-applications/CMakeLists_files.cmake)
@@ -26,7 +25,10 @@ add_library(custom-opm-flowdiag-app
     ${project_source_files_complete_path1} 
 )
 
-target_link_libraries(custom-opm-flowdiag-app ecl)
+target_link_libraries(custom-opm-flowdiag-app 
+  ecl
+  boost-Subset
+)
 
 if (MSVC)
     set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4190 /wd4267")

ThirdParty/nightcharts/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 2.8.12)
 
 project (nightcharts)
 
@@ -14,3 +14,9 @@ add_library( ${PROJECT_NAME}
     ${MAIN_SOURCE_FILES}
 )
 
+target_include_directories(${PROJECT_NAME}
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+source_group("" FILES ${PROJECT_FILES})