Page MenuHomePhabricator
Files F13115373

D1339.id3666.diff
No OneTemporary
Actions

D1339.id3666.diff
View Options

diff --git a/cmake/modules/FindGMP.cmake b/cmake/modules/FindGMP.cmake
--- a/cmake/modules/FindGMP.cmake
+++ b/cmake/modules/FindGMP.cmake
@@ -1,23 +1,24 @@
# Try to find the GMP librairies
# GMP_FOUND - system has GMP lib
# GMP_INCLUDE_DIR - the GMP include directory
-# GMP_LIBRARIES - Libraries needed to use GMP
-# GMPXX_LIBRARIES - Libraries needed to use GMP C++ API
+# GMP_LIBRARY - Library needed to use GMP
+# GMPXX_LIBRARY - Library needed to use GMP C++ API
-if(GMP_INCLUDE_DIR AND GMP_LIBRARIES)
+if(GMP_INCLUDE_DIR AND GMP_LIBRARY)
# Already in cache, be silent
set(GMP_FIND_QUIETLY TRUE)
endif()
find_path(GMP_INCLUDE_DIR NAMES gmp.h)
-find_library(GMP_LIBRARIES NAMES gmp libgmp)
-find_library(GMPXX_LIBRARIES NAMES gmpxx libgmpxx)
-MESSAGE(STATUS "GMP libs: " ${GMP_LIBRARIES} " " ${GMPXX_LIBRARIES})
+find_library(GMP_LIBRARY NAMES gmp libgmp)
+find_library(GMPXX_LIBRARY NAMES gmpxx libgmpxx)
+
+message(STATUS "GMP libs: " ${GMP_LIBRARY} " " ${GMPXX_LIBRARY})
include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMP DEFAULT_MSG GMP_INCLUDE_DIR GMP_LIBRARIES)
+find_package_handle_standard_args(GMP DEFAULT_MSG GMP_INCLUDE_DIR GMP_LIBRARY)
-mark_as_advanced(GMP_INCLUDE_DIR GMP_LIBRARIES)
-if(GMP_INCLUDE_DIR AND GMP_LIBRARIES)
- set(GMP_FOUND TRUE)
-endif()
+mark_as_advanced(GMP_INCLUDE_DIR GMP_LIBRARY GMPXX_LIBRARY)
+
+set(GMP_LIBRARIES ${GMP_LIBRARY} ${GMPXX_LIBRARY})
+set(GMP_INCLUDE_DIRS ${GMP_INCLUDE_DIR})
diff --git a/src/secp256k1/CMakeLists.txt b/src/secp256k1/CMakeLists.txt
--- a/src/secp256k1/CMakeLists.txt
+++ b/src/secp256k1/CMakeLists.txt
@@ -35,7 +35,7 @@
find_package(GMP)
if(GMP_FOUND)
target_include_directories(secp256k1 PUBLIC ${GMP_INCLUDE_DIR})
- target_link_libraries(secp256k1 ${GMP_LIBRARIES})
+ target_link_libraries(secp256k1 ${GMP_LIBRARY})
set(USE_NUM_GMP 1)
set(USE_FIELD_INV_NUM 1)
set(USE_SCALAR_INV_NUM 1)

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 1, 10:58 (12 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5187440
Default Alt Text
D1339.id3666.diff (1 KB)

Event Timeline