From ff4fef570e8df6ce44ceb1d9071f860474eb1f95 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Fri, 7 Apr 2017 23:56:02 +0200 Subject: Fix cmake library default build problem since moving to lib/ Also make Lua library check a cmake module --- cmake/Modules/FindGMP.cmake | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'cmake/Modules/FindGMP.cmake') diff --git a/cmake/Modules/FindGMP.cmake b/cmake/Modules/FindGMP.cmake index d584eb1e7..64a57cfe0 100644 --- a/cmake/Modules/FindGMP.cmake +++ b/cmake/Modules/FindGMP.cmake @@ -1,6 +1,6 @@ option(ENABLE_SYSTEM_GMP "Use GMP from system" TRUE) mark_as_advanced(GMP_LIBRARY GMP_INCLUDE_DIR) -set(USE_SYSTEM_GMP FALSE PARENT_SCOPE) +set(USE_SYSTEM_GMP FALSE) if(ENABLE_SYSTEM_GMP) find_library(GMP_LIBRARY NAMES libgmp.so) @@ -9,7 +9,6 @@ if(ENABLE_SYSTEM_GMP) if(GMP_LIBRARY AND GMP_INCLUDE_DIR) message (STATUS "Using GMP provided by system.") set(USE_SYSTEM_GMP TRUE) - set(USE_SYSTEM_GMP TRUE PARENT_SCOPE) else() message (STATUS "Detecting GMP from system failed.") endif() @@ -19,11 +18,9 @@ endif() if(NOT USE_SYSTEM_GMP) message(STATUS "Using bundled mini-gmp library.") - set(GMP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gmp) - set(GMP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gmp PARENT_SCOPE) + set(GMP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/gmp) set(GMP_LIBRARY gmp) - set(GMP_LIBRARY gmp PARENT_SCOPE) - add_subdirectory(gmp) + add_subdirectory(lib/gmp) endif() include(FindPackageHandleStandardArgs) -- cgit v1.2.3