Dekker1/on-restart-benchmarks
Archived
1
0
Fork 0
Code

Merge commit '5df85436d574a843ea4c3f7107149d5b494b94a1' into develop

Browse Source
This commit is contained in:
Jip J. Dekker 2021-07-12 17:09:13 +10:00
commit b5ed4bc90e
No known key found for this signature in database
GPG Key ID: 517DF4A00618C9C3
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
software/mza/cmake/targets/libminizinc_gecode.cmake
View File

@ -21,6 +21,17 @@ if(GECODE_FOUND AND USE_GECODE)
target_include_directories(minizinc_gecode PRIVATE "${GECODE_INCLUDE_DIRS}")
add_dependencies(minizinc_gecode minizinc_parser)
# Workaround to force CMake to link in the correct order
target_link_libraries(Gecode::Support INTERFACE ${CMAKE_THREAD_LIBS_INIT})
target_link_libraries(Gecode::Kernel INTERFACE Gecode::Support)
target_link_libraries(Gecode::Search INTERFACE Gecode::Kernel)
target_link_libraries(Gecode::Int INTERFACE Gecode::Kernel)
target_link_libraries(Gecode::Set INTERFACE Gecode::Int)
target_link_libraries(Gecode::Float INTERFACE Gecode::Int)
target_link_libraries(Gecode::Minimodel INTERFACE Gecode::Int Gecode::Set Gecode::Float Gecode::Search)
target_link_libraries(Gecode::Driver INTERFACE Gecode::Int)
target_link_libraries(Gecode::Flatzinc INTERFACE Gecode::Minimodel Gecode::Driver)
### Setup correct compilation into the MiniZinc library
target_compile_definitions(mzn PRIVATE HAS_GECODE)
target_sources(mzn PRIVATE $<TARGET_OBJECTS:minizinc_gecode>)

9
software/mza/cmake/targets/libmza.cmake
View File

@ -3,6 +3,13 @@ if(GECODE_FOUND AND USE_GECODE)
lib/c_interface.cpp
include/minizinc/c_interface.h
)
target_link_libraries(mza mzn)
install(
TARGETS mza
EXPORT libminizincTargets
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
endif()