resolving dependencies

Alirezalm · Sep 6, 2023 · 077dc70 · 077dc70
1 parent 9484468
commit 077dc70
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,11 +27,7 @@ add_subdirectory(src/Solver)
 
 add_subdirectory(src/PrimalSolver)
 
-add_executable(${PROJECT_NAME}
-        src/scot.cpp
-        src/PrimalSolver/InlpSolver.h
-        src/PrimalSolver/DistributedOperatorSplittingEngine.cpp
-        src/PrimalSolver/DistributedOperatorSplittingEngine.h)
+add_executable(${PROJECT_NAME} src/scot.cpp)
 
 target_include_directories(${PROJECT_NAME} PUBLIC
         "${PROJECT_SOURCE_DIR}/DOSE"
@@ -52,6 +48,7 @@ target_link_libraries(${PROJECT_NAME} mip)
 target_link_libraries(${PROJECT_NAME} model)
 target_link_libraries(${PROJECT_NAME} solver)
 target_link_libraries(${PROJECT_NAME} primal)
+
 target_link_libraries(${PROJECT_NAME} spdlog.a)
 target_link_libraries(${PROJECT_NAME}  fmt.a)
 

diff --git a/src/PrimalSolver/CMakeLists.txt b/src/PrimalSolver/CMakeLists.txt
@@ -7,6 +7,10 @@ add_library(primal SHARED ${SCOT_PRIMAL})
 target_include_directories(primal PRIVATE
         "${CMAKE_SOURCE_DIR}/DOSE"
 )
+target_link_directories(primal PUBLIC
+        "${CMAKE_SOURCE_DIR}/Dose")
+
+target_link_libraries(primal PUBLIC dose)
 
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 

diff --git a/src/Solver/CMakeLists.txt b/src/Solver/CMakeLists.txt
@@ -10,11 +10,14 @@ target_include_directories(solver PRIVATE
         "${CMAKE_SOURCE_DIR}/ExternLibs/spdlog"
 )
 target_link_directories(solver PUBLIC
-        "${CMAKE_SOURCE_DIR}/Tasks"
-        "${CMAKE_SOURCE_DIR}/Algorithms")
+        "${CMAKE_SOURCE_DIR}/src/Tasks"
+        "${CMAKE_SOURCE_DIR}/src/Algorithms"
+        "${CMAKE_SOURCE_DIR}/src/Model")
 
 target_link_libraries(solver PUBLIC tasks)
 target_link_libraries(solver PUBLIC algorithms)
+target_link_libraries(solver PUBLIC model)
+
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 file(GLOB INC "*.h")
 

diff --git a/src/Tasks/CMakeLists.txt b/src/Tasks/CMakeLists.txt
@@ -9,9 +9,12 @@ target_include_directories(tasks PRIVATE
         "$ENV{GUROBI_HOME}/include"
         "${CMAKE_SOURCE_DIR}/ExternLibs/spdlog")
 
-target_link_directories(tasks PUBLIC "${CMAKE_SOURCE_DIR}/MIPSolver")
+target_link_directories(tasks PUBLIC
+        "${CMAKE_SOURCE_DIR}/MIPSolver"
+        "${CMAKE_SOURCE_DIR}/PrimalSolver")
 
 target_link_libraries(tasks PUBLIC mip)
+target_link_libraries(tasks PUBLIC primal)
 
 file(GLOB INC "*.h")