Merge branch 'fix-cmake-include' into 'v92-bugfix'

Fix cmake include See merge request integer/scip!3716
scipopt · Mar 1, 2025 · 6b4c457 · 6b4c457
2 parents 00ffe4b + bd0dd82
commit 6b4c457
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 18 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -19,9 +19,10 @@ Build system
 
 ### Cmake
 
--  allow to set HIGHS_DIR via -D flag as well
+- allow to set HIGHS_DIR via -D flag as well
 - reenable building and testing of SCFLP example
 - fixed that compiler flags for sanitizers were not used for compiling objects of SCIP library
+- prioritize local includes in applications and examples to link the intended SCIP version to them
 
 ### Makefile
 

diff --git a/applications/Coloring/CMakeLists.txt b/applications/Coloring/CMakeLists.txt
@@ -9,7 +9,7 @@ else()
   find_package(SCIP REQUIRED)
 endif()
 
-include_directories(${SCIP_INCLUDE_DIRS})
+include_directories(BEFORE PUBLIC ${SCIP_INCLUDE_DIRS})
 
 add_executable(coloring
     src/branch_coloring.c

diff --git a/applications/CycleClustering/CMakeLists.txt b/applications/CycleClustering/CMakeLists.txt
@@ -9,7 +9,7 @@ else()
   find_package(SCIP REQUIRED)
 endif()
 
-include_directories(${SCIP_INCLUDE_DIRS})
+include_directories(BEFORE PUBLIC ${SCIP_INCLUDE_DIRS})
 
 add_executable(cycleclustering
     src/main.c

diff --git a/applications/MinIISC/CMakeLists.txt b/applications/MinIISC/CMakeLists.txt
@@ -9,7 +9,7 @@ else()
   find_package(SCIP REQUIRED)
 endif()
 
-include_directories(${SCIP_INCLUDE_DIRS})
+include_directories(BEFORE PUBLIC ${SCIP_INCLUDE_DIRS})
 
 add_executable(miniisc
     src/benders.c

diff --git a/applications/Ringpacking/CMakeLists.txt b/applications/Ringpacking/CMakeLists.txt
@@ -9,7 +9,7 @@ else()
   find_package(SCIP REQUIRED)
 endif()
 
-include_directories(${SCIP_INCLUDE_DIRS})
+include_directories(BEFORE PUBLIC ${SCIP_INCLUDE_DIRS})
 
 add_executable(ringpacking
    src/cmain.c

diff --git a/applications/Scheduler/CMakeLists.txt b/applications/Scheduler/CMakeLists.txt
@@ -9,7 +9,7 @@ else()
   find_package(SCIP REQUIRED)
 endif()
 
-include_directories(${SCIP_INCLUDE_DIRS})
+include_directories(BEFORE PUBLIC ${SCIP_INCLUDE_DIRS})
 
 add_executable(scheduler
     src/main.cpp

diff --git a/examples/Binpacking/CMakeLists.txt b/examples/Binpacking/CMakeLists.txt
@@ -9,7 +9,7 @@ else()
   find_package(SCIP REQUIRED)
 endif()
 
-include_directories(${SCIP_INCLUDE_DIRS})
+include_directories(BEFORE PUBLIC ${SCIP_INCLUDE_DIRS})
 
 add_executable(binpacking
    src/branch_ryanfoster.c

diff --git a/examples/CallableLibrary/CMakeLists.txt b/examples/CallableLibrary/CMakeLists.txt
@@ -10,7 +10,7 @@ else()
   find_package(SCIP REQUIRED)
 endif()
 
-include_directories(${SCIP_INCLUDE_DIRS})
+include_directories(BEFORE PUBLIC ${SCIP_INCLUDE_DIRS})
 
 add_executable(gastrans
    src/gastrans.c)

diff --git a/examples/Eventhdlr/CMakeLists.txt b/examples/Eventhdlr/CMakeLists.txt
@@ -9,7 +9,7 @@ else()
   find_package(SCIP REQUIRED)
 endif()
 
-include_directories(${SCIP_INCLUDE_DIRS})
+include_directories(BEFORE PUBLIC ${SCIP_INCLUDE_DIRS})
 
 add_executable(eventhdlr
    src/cmain.c

diff --git a/examples/GMI/CMakeLists.txt b/examples/GMI/CMakeLists.txt
@@ -9,7 +9,7 @@ else()
   find_package(SCIP REQUIRED)
 endif()
 
-include_directories(${SCIP_INCLUDE_DIRS})
+include_directories(BEFORE PUBLIC ${SCIP_INCLUDE_DIRS})
 
 add_executable(gmi
    src/cmain.c

diff --git a/examples/LOP/CMakeLists.txt b/examples/LOP/CMakeLists.txt
@@ -10,7 +10,7 @@ else()
   find_package(SCIP REQUIRED)
 endif()
 
-include_directories(${SCIP_INCLUDE_DIRS})
+include_directories(BEFORE PUBLIC ${SCIP_INCLUDE_DIRS})
 
 add_executable(lop
    src/cmain.c

diff --git a/examples/MIPSolver/CMakeLists.txt b/examples/MIPSolver/CMakeLists.txt
@@ -9,7 +9,7 @@ else()
   find_package(SCIP REQUIRED)
 endif()
 
-include_directories(${SCIP_INCLUDE_DIRS})
+include_directories(BEFORE PUBLIC ${SCIP_INCLUDE_DIRS})
 
 add_executable(scipmip
    src/cppmain.cpp)

diff --git a/examples/Queens/CMakeLists.txt b/examples/Queens/CMakeLists.txt
@@ -9,7 +9,7 @@ else()
   find_package(SCIP REQUIRED)
 endif()
 
-include_directories(${SCIP_INCLUDE_DIRS})
+include_directories(BEFORE PUBLIC ${SCIP_INCLUDE_DIRS})
 
 add_executable(queens
    src/queens.cpp

diff --git a/examples/Relaxator/CMakeLists.txt b/examples/Relaxator/CMakeLists.txt
@@ -9,7 +9,7 @@ else()
   find_package(SCIP REQUIRED)
 endif()
 
-include_directories(${SCIP_INCLUDE_DIRS})
+include_directories(BEFORE PUBLIC ${SCIP_INCLUDE_DIRS})
 
 add_executable(relaxator
    src/cmain.c

diff --git a/examples/SCFLP/CMakeLists.txt b/examples/SCFLP/CMakeLists.txt
@@ -9,7 +9,7 @@ else()
   find_package(SCIP REQUIRED)
 endif()
 
-include_directories(${SCIP_INCLUDE_DIRS})
+include_directories(BEFORE PUBLIC ${SCIP_INCLUDE_DIRS})
 
 add_executable(scflp
    src/cmain.c

diff --git a/examples/Sudoku/CMakeLists.txt b/examples/Sudoku/CMakeLists.txt
@@ -9,7 +9,7 @@ else()
   find_package(SCIP REQUIRED)
 endif()
 
-include_directories(${SCIP_INCLUDE_DIRS})
+include_directories(BEFORE PUBLIC ${SCIP_INCLUDE_DIRS})
 
 add_executable(sudoku
    src/sudoku_main.cpp

diff --git a/examples/TSP/CMakeLists.txt b/examples/TSP/CMakeLists.txt
@@ -9,7 +9,7 @@ else()
   find_package(SCIP REQUIRED)
 endif()
 
-include_directories(${SCIP_INCLUDE_DIRS})
+include_directories(BEFORE PUBLIC ${SCIP_INCLUDE_DIRS})
 
 add_executable(sciptsp
    src/ConshdlrSubtour.cpp

diff --git a/examples/VRP/CMakeLists.txt b/examples/VRP/CMakeLists.txt
@@ -9,7 +9,7 @@ else()
   find_package(SCIP REQUIRED)
 endif()
 
-include_directories(${SCIP_INCLUDE_DIRS})
+include_directories(BEFORE PUBLIC ${SCIP_INCLUDE_DIRS})
 
 add_executable(vrp
    src/main_vrp.cpp