commit 5df85436d574a843ea4c3f7107149d5b494b94a1 · dekker.one/on-restart-benchmarks

+11

cmake/targets/libminizinc_gecode.cmake

···

       21
       21
        
         target_include_directories(minizinc_gecode PRIVATE "${GECODE_INCLUDE_DIRS}")

     

       22
       22
        
         add_dependencies(minizinc_gecode minizinc_parser)

     

       23
       23
        
       

     

       24
       24
       +
         # Workaround to force CMake to link in the correct order

     

       25
       25
       +
         target_link_libraries(Gecode::Support INTERFACE ${CMAKE_THREAD_LIBS_INIT})

     

       26
       26
       +
         target_link_libraries(Gecode::Kernel INTERFACE Gecode::Support)

     

       27
       27
       +
         target_link_libraries(Gecode::Search INTERFACE Gecode::Kernel)

     

       28
       28
       +
         target_link_libraries(Gecode::Int INTERFACE Gecode::Kernel)

     

       29
       29
       +
         target_link_libraries(Gecode::Set INTERFACE Gecode::Int)

     

       30
       30
       +
         target_link_libraries(Gecode::Float INTERFACE Gecode::Int)

     

       31
       31
       +
         target_link_libraries(Gecode::Minimodel INTERFACE Gecode::Int Gecode::Set Gecode::Float Gecode::Search)

     

       32
       32
       +
         target_link_libraries(Gecode::Driver INTERFACE Gecode::Int)

     

       33
       33
       +
         target_link_libraries(Gecode::Flatzinc INTERFACE Gecode::Minimodel Gecode::Driver)

     

       34
       34
       +
       

     

       24
       35
        
         ### Setup correct compilation into the MiniZinc library

     

       25
       36
        
         target_compile_definitions(mzn PRIVATE HAS_GECODE)

     

       26
       37
        
         target_sources(mzn PRIVATE $<TARGET_OBJECTS:minizinc_gecode>)

+8 -1

cmake/targets/libmza.cmake

···

       3
       3
        
           lib/c_interface.cpp

     

       4
       4
        
           include/minizinc/c_interface.h

     

       5
       5
        
         )

     

       6
       6
       +
         target_link_libraries(mza mzn)

     

       6
       7
        
       

     

       7
       7
       -
         target_link_libraries(mza mzn)

     

       8
       8
       +
       	install(

     

       9
       9
       +
       		TARGETS mza

     

       10
       10
       +
       		EXPORT libminizincTargets

     

       11
       11
       +
       		RUNTIME DESTINATION bin

     

       12
       12
       +
       		LIBRARY DESTINATION lib

     

       13
       13
       +
       		ARCHIVE DESTINATION lib

     

       14
       14
       +
       	)

     

       8
       15
        
       endif()