Merge pull request #2 from fontanf/dev

Fix build files
fontanf · Apr 16, 2024 · abbe052 · abbe052
2 parents 74fe3a4 + 8d153c3
commit abbe052
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 25 deletions.
diff --git a/python/BUILD b/python/BUILD
diff --git a/src/knapsack/CMakeLists.txt b/src/knapsack/CMakeLists.txt
@@ -23,8 +23,8 @@ target_link_libraries(KnapsackSolver_knapsack_main PUBLIC
     KnapsackSolver_knapsack_dynamic_programming_bellman
     KnapsackSolver_knapsack_dynamic_programming_primal_dual
     Boost::program_options)
-set_target_properties(KnapsackSolver_knapsack_main PROPERTIES OUTPUT_NAME "knapsacksolver_knapsack" ) 
-install(TARGETS KnapsackSolver_knapsack_main DESTINATION bin)
+set_target_properties(KnapsackSolver_knapsack_main PROPERTIES OUTPUT_NAME "knapsacksolver_knapsack")
+install(TARGETS KnapsackSolver_knapsack_main)
 
 add_library(KnapsackSolver_knapsack_generator)
 target_sources(KnapsackSolver_knapsack_generator PRIVATE

diff --git a/src/multiple_choice_subset_sum/CMakeLists.txt b/src/multiple_choice_subset_sum/CMakeLists.txt
@@ -8,7 +8,7 @@ target_include_directories(KnapsackSolver_multiple_choice_subset_sum PUBLIC
     ${PROJECT_SOURCE_DIR}/include)
 target_link_libraries(KnapsackSolver_multiple_choice_subset_sum PUBLIC
     OptimizationTools::utils)
-add_library(KnapsackSolver::knapsack ALIAS KnapsackSolver_multiple_choice_subset_sum)
+add_library(KnapsackSolver::multiple_choice_subset_sum ALIAS KnapsackSolver_multiple_choice_subset_sum)
 
 add_subdirectory(algorithms)
 
@@ -18,5 +18,5 @@ target_sources(KnapsackSolver_multiple_choice_subset_sum_main PRIVATE
 target_link_libraries(KnapsackSolver_multiple_choice_subset_sum_main PUBLIC
     KnapsackSolver_multiple_choice_subset_sum_dynamic_programming_bellman
     Boost::program_options)
-set_target_properties(KnapsackSolver_multiple_choice_subset_sum_main PROPERTIES OUTPUT_NAME "knapsacksolver_multiple_choice_subset_sum" ) 
-install(TARGETS KnapsackSolver_multiple_choice_subset_sum_main DESTINATION bin)
+set_target_properties(KnapsackSolver_multiple_choice_subset_sum_main PROPERTIES OUTPUT_NAME "knapsacksolver_multiple_choice_subset_sum")
+install(TARGETS KnapsackSolver_multiple_choice_subset_sum_main)
diff --git a/src/multiple_choice_subset_sum/algorithms/CMakeLists.txt b/src/multiple_choice_subset_sum/algorithms/CMakeLists.txt
@@ -5,4 +5,4 @@ target_include_directories(KnapsackSolver_multiple_choice_subset_sum_dynamic_pro
     ${PROJECT_SOURCE_DIR}/include)
 target_link_libraries(KnapsackSolver_multiple_choice_subset_sum_dynamic_programming_bellman PUBLIC
     KnapsackSolver_multiple_choice_subset_sum)
-add_library(KnapsackSolver::knapsack::dynamic_programming_bellman ALIAS KnapsackSolver_multiple_choice_subset_sum_dynamic_programming_bellman)
+add_library(KnapsackSolver::multiple_choice_subset_sum::dynamic_programming_bellman ALIAS KnapsackSolver_multiple_choice_subset_sum_dynamic_programming_bellman)
diff --git a/src/subset_sum/CMakeLists.txt b/src/subset_sum/CMakeLists.txt
@@ -20,12 +20,12 @@ target_link_libraries(KnapsackSolver_subset_sum_main PUBLIC
     KnapsackSolver_subset_sum_dynamic_programming_balancing
     KnapsackSolver_subset_sum_dynamic_programming_primal_dual
     Boost::program_options)
-set_target_properties(KnapsackSolver_subset_sum_main PROPERTIES OUTPUT_NAME "knapsacksolver_subset_sum" ) 
-install(TARGETS KnapsackSolver_subset_sum_main DESTINATION bin)
+set_target_properties(KnapsackSolver_subset_sum_main PROPERTIES OUTPUT_NAME "knapsacksolver_subset_sum")
+install(TARGETS KnapsackSolver_subset_sum_main)
 
 add_library(KnapsackSolver_subset_sum_generator)
 target_sources(KnapsackSolver_subset_sum_generator PRIVATE
     generator.cpp)
 target_link_libraries(KnapsackSolver_subset_sum_generator PUBLIC
     KnapsackSolver_subset_sum)
-add_library(KnapsackSolver::knapsack::generator ALIAS KnapsackSolver_subset_sum_generator)
+add_library(KnapsackSolver::subset_sum::generator ALIAS KnapsackSolver_subset_sum_generator)
diff --git a/src/subset_sum/algorithms/CMakeLists.txt b/src/subset_sum/algorithms/CMakeLists.txt
@@ -5,7 +5,7 @@ target_include_directories(KnapsackSolver_subset_sum_dynamic_programming_bellman
     ${PROJECT_SOURCE_DIR}/include)
 target_link_libraries(KnapsackSolver_subset_sum_dynamic_programming_bellman PUBLIC
     KnapsackSolver_subset_sum)
-add_library(KnapsackSolver::knapsack::dynamic_programming_bellman ALIAS KnapsackSolver_subset_sum_dynamic_programming_bellman)
+add_library(KnapsackSolver::subset_sum::dynamic_programming_bellman ALIAS KnapsackSolver_subset_sum_dynamic_programming_bellman)
 
 add_library(KnapsackSolver_subset_sum_dynamic_programming_balancing)
 target_sources(KnapsackSolver_subset_sum_dynamic_programming_balancing PRIVATE
@@ -14,7 +14,7 @@ target_include_directories(KnapsackSolver_subset_sum_dynamic_programming_balanci
     ${PROJECT_SOURCE_DIR}/include)
 target_link_libraries(KnapsackSolver_subset_sum_dynamic_programming_balancing PUBLIC
     KnapsackSolver_subset_sum)
-add_library(KnapsackSolver::knapsack::dynamic_programming_balancing ALIAS KnapsackSolver_subset_sum_dynamic_programming_balancing)
+add_library(KnapsackSolver::subset_sum::dynamic_programming_balancing ALIAS KnapsackSolver_subset_sum_dynamic_programming_balancing)
 
 add_library(KnapsackSolver_subset_sum_dynamic_programming_primal_dual)
 target_sources(KnapsackSolver_subset_sum_dynamic_programming_primal_dual PRIVATE
@@ -23,4 +23,4 @@ target_include_directories(KnapsackSolver_subset_sum_dynamic_programming_primal_
     ${PROJECT_SOURCE_DIR}/include)
 target_link_libraries(KnapsackSolver_subset_sum_dynamic_programming_primal_dual PUBLIC
     KnapsackSolver_subset_sum)
-add_library(KnapsackSolver::knapsack::dynamic_programming_primal_dual ALIAS KnapsackSolver_subset_sum_dynamic_programming_primal_dual)
+add_library(KnapsackSolver::subset_sum::dynamic_programming_primal_dual ALIAS KnapsackSolver_subset_sum_dynamic_programming_primal_dual)