Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build files #2

Merged
merged 1 commit into from
Apr 16, 2024
Merged

Fix build files #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions python/BUILD
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/knapsack/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/multiple_choice_subset_sum/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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)
2 changes: 1 addition & 1 deletion src/multiple_choice_subset_sum/algorithms/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
6 changes: 3 additions & 3 deletions src/subset_sum/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
6 changes: 3 additions & 3 deletions src/subset_sum/algorithms/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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)
Loading