Updated FindGMP

Author: zfergus

CMakeLists.txt

@@ -50,9 +50,8 @@ target_link_libraries(tight_inclusion PRIVATE warnings::all)
 #Optional
 #GMP
 if(TIGHT_INCLUSION_WITH_GMP)
-message(STATUS "TIGHT_INCLUSION_WITH_GMP is defined, now using rational root finder")
-  target_include_directories(tight_inclusion PUBLIC ${GMP_INCLUDE_DIRS} src)
-  target_link_libraries(tight_inclusion PUBLIC ${GMP_LIBRARIES})
+  message(STATUS "TIGHT_INCLUSION_WITH_GMP is defined, now using rational root finder")
+  target_link_libraries(tight_inclusion PUBLIC gmp::gmp)
   target_compile_definitions(tight_inclusion PUBLIC TIGHT_INCLUSION_USE_GMP)
 endif()
 
@@ -74,7 +73,7 @@ if (TIGHT_INCLUSION_WITH_DOUBLE_PRECISION)
   target_compile_definitions(tight_inclusion PUBLIC TIGHT_INCLUSION_DOUBLE)
   message(STATUS "Using Double Precision Floating Points")
 else()
-message(STATUS "Using Single Precision Floating Points")  
+message(STATUS "Using Single Precision Floating Points")
 endif()
 if(TIGHT_INCLUSION_LIMIT_QUEUE_SIZE)
 	target_compile_definitions(tight_inclusion PUBLIC TI_LIMIT_QUEUE_SIZE)
@@ -103,10 +102,9 @@ if(TIGHT_INCLUSION_TOPLEVEL_PROJECT)
   ticcd_download_sample_queries()
 
   if (NOT TIGHT_INCLUSION_WITH_GMP AND TIGHT_INCLUSION_WITH_TESTS)
-    target_include_directories(tight_inclusion PUBLIC ${GMP_INCLUDE_DIRS} src)
-    target_link_libraries(tight_inclusion PUBLIC ${GMP_LIBRARIES})
+    target_link_libraries(tight_inclusion PUBLIC gmp::gmp)
     target_compile_definitions(tight_inclusion PUBLIC TIGHT_INCLUSION_RUN_EXAMPLES)
     target_compile_definitions(Tight_Inclusion_bin PUBLIC
-    TICCD_EXAMPLE_QUERIES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/external/Sample-Queries/")
+        TICCD_EXAMPLE_QUERIES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/external/Sample-Queries/")
   endif()
 endif()

cmake/FindGMP.cmake

@@ -0,0 +1,79 @@
+# Try to find the GNU Multiple Precision Arithmetic Library (GMP)
+# See http://gmplib.org/
+
+find_path(GMP_INCLUDES
+    NAMES
+        gmp.h
+    PATHS
+        ENV GMP_DIR
+        ${GMP_WINDOWS_PATH}
+        ${INCLUDE_INSTALL_DIR}
+    PATH_SUFFIXES
+        include
+)
+
+find_library(GMP_LIBRARIES
+    NAMES
+        gmp
+        libgmp
+    PATHS
+        ENV GMP_DIR
+        ${GMP_WINDOWS_PATH}
+        ${LIB_INSTALL_DIR}
+    PATH_SUFFIXES
+        lib
+)
+
+set(GMP_EXTRA_VARS "")
+if(WIN32)
+    # Find dll file and set IMPORTED_LOCATION to the .dll file
+    find_file(GMP_RUNTIME_LIB
+        NAMES
+            gmp.dll
+            libgmp-10.dll
+        PATHS
+            ENV GMP_DIR
+            ${GMP_WINDOWS_PATH}
+            ${LIB_INSTALL_DIR}
+        PATH_SUFFIXES
+            lib
+    )
+    list(APPEND GMP_EXTRA_VARS GMP_RUNTIME_LIB)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GMP
+    REQUIRED_VARS
+        GMP_INCLUDES
+        GMP_LIBRARIES
+        ${GMP_EXTRA_VARS}
+    REASON_FAILURE_MESSAGE
+        "GMP is not installed on your system. Install GMP using your preferred package manager."
+)
+mark_as_advanced(GMP_INCLUDES GMP_LIBRARIES)
+
+if(GMP_INCLUDES AND GMP_LIBRARIES AND NOT TARGET gmp::gmp)
+    if(GMP_RUNTIME_LIB)
+        add_library(gmp::gmp SHARED IMPORTED)
+    else()
+        add_library(gmp::gmp UNKNOWN IMPORTED)
+    endif()
+
+    # Set public header location and link language
+    set_target_properties(gmp::gmp PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+        INTERFACE_INCLUDE_DIRECTORIES "${GMP_INCLUDES}"
+    )
+
+    # Set lib location. On Windows we specify both the .lib and the .dll paths
+    if(GMP_RUNTIME_LIB)
+        set_target_properties(gmp::gmp PROPERTIES
+            IMPORTED_IMPLIB "${GMP_LIBRARIES}"
+            IMPORTED_LOCATION "${GMP_RUNTIME_LIB}"
+        )
+    else()
+        set_target_properties(gmp::gmp PROPERTIES
+            IMPORTED_LOCATION "${GMP_LIBRARIES}"
+        )
+    endif()
+endif()