Skip to content

Commit 39c9b74

Browse files
committed
Adress codex review comments
1 parent ee71a66 commit 39c9b74

2 files changed

Lines changed: 19 additions & 1 deletion

File tree

CMakeLists.txt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,9 @@ function(add_gecode_component_library lib)
535535

536536
add_library(gecode${lib} INTERFACE)
537537
target_link_libraries(gecode${lib} INTERFACE gecode${lib}_${GECODE_DEFAULT_LINK_VARIANT})
538+
list(APPEND GECODE_INSTALL_TARGETS gecode${lib})
538539
list(APPEND GECODE_EXPORT_TARGETS gecode${lib})
540+
set(GECODE_INSTALL_TARGETS ${GECODE_INSTALL_TARGETS} PARENT_SCOPE)
539541
set(GECODE_EXPORT_TARGETS ${GECODE_EXPORT_TARGETS} PARENT_SCOPE)
540542
endfunction()
541543

@@ -759,7 +761,8 @@ install(TARGETS ${GECODE_INSTALL_TARGETS}
759761
EXPORT GecodeTargets
760762
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
761763
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
762-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
764+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
765+
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
763766

764767
if(GECODE_ENABLE_FLATZINC)
765768
install(FILES ${MZN_SCRIPT} DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -799,6 +802,10 @@ set(GECODE_PACKAGE_NEEDS_THREADS OFF)
799802
if(GECODE_ENABLE_THREAD)
800803
set(GECODE_PACKAGE_NEEDS_THREADS ON)
801804
endif()
805+
set(GECODE_PACKAGE_NEEDS_MPFR OFF)
806+
if(GECODE_ENABLE_FLOAT_VARS AND GECODE_ENABLE_MPFR AND MPFR_FOUND AND TARGET MPFR::MPFR)
807+
set(GECODE_PACKAGE_NEEDS_MPFR ON)
808+
endif()
802809
set(GECODE_PACKAGE_QT_MAJOR "")
803810
set(GECODE_PACKAGE_QT_COMPONENTS "")
804811
if(GECODE_BUILD_GIST_TARGET)
@@ -834,4 +841,8 @@ install(FILES
834841
${CMAKE_CURRENT_BINARY_DIR}/GecodeConfigVersion.cmake
835842
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Gecode)
836843

844+
install(FILES
845+
${CMAKE_CURRENT_SOURCE_DIR}/misc/cmake_modules/FindMPFR.cmake
846+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Gecode)
847+
837848
set_property(GLOBAL PROPERTY USE_FOLDERS ON)

cmake/GecodeConfig.cmake.in

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ include(CMakeFindDependencyMacro)
44
if("@GECODE_PACKAGE_NEEDS_THREADS@" STREQUAL "ON")
55
find_dependency(Threads REQUIRED)
66
endif()
7+
if("@GECODE_PACKAGE_NEEDS_MPFR@" STREQUAL "ON")
8+
set(_gecode_saved_module_path "${CMAKE_MODULE_PATH}")
9+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
10+
find_dependency(MPFR REQUIRED)
11+
set(CMAKE_MODULE_PATH "${_gecode_saved_module_path}")
12+
unset(_gecode_saved_module_path)
13+
endif()
714
set(_gecode_qt_components "@GECODE_PACKAGE_QT_COMPONENTS@")
815
if("@GECODE_PACKAGE_QT_MAJOR@" STREQUAL "6")
916
find_dependency(Qt6 REQUIRED COMPONENTS ${_gecode_qt_components})

0 commit comments

Comments
 (0)