From 1c43f79b169c8ec367057b3fe8c85d46c5d2a7a6 Mon Sep 17 00:00:00 2001 From: Scott Howard Date: Thu, 25 Jun 2015 19:34:25 -0400 Subject: [PATCH] simplify secp256k1 install and portabillity --- CMakeLists.txt | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 73af19f..8312dba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,28 +68,23 @@ if ( WIN32 ) set_target_properties( secp256k1 PROPERTIES COMPILE_DEFINITIONS "${SECP256K1_BUILD_DEFINES}" LINKER_LANGUAGE C ) else ( WIN32 ) include(ExternalProject) - if( "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}" ) - set( SECP_INSTALL_COMMAND true ) - else() - set( SECP_INSTALL_COMMAND make install ) - endif() ExternalProject_Add( project_secp256k1 PREFIX ${CMAKE_CURRENT_BINARY_DIR}/vendor/secp256k1-zkp SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp/configure --prefix=${CMAKE_CURRENT_BINARY_DIR}/vendor/secp256k1-zkp --with-bignum=no BUILD_COMMAND make - INSTALL_COMMAND ${SECP_INSTALL_COMMAND} + INSTALL_COMMAND true ) ExternalProject_Add_Step(project_secp256k1 autogen WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp - COMMAND ./autogen.sh + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp/autogen.sh DEPENDERS configure ) - ExternalProject_Get_Property(project_secp256k1 install_dir) + ExternalProject_Get_Property(project_secp256k1 binary_dir) add_library(secp256k1 STATIC IMPORTED) - set_property(TARGET secp256k1 PROPERTY IMPORTED_LOCATION ${install_dir}/lib/libsecp256k1.a) + set_property(TARGET secp256k1 PROPERTY IMPORTED_LOCATION ${binary_dir}/.libs/libsecp256k1${CMAKE_STATIC_LIBRARY_SUFFIX}) set_property(TARGET secp256k1 PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp/include) add_dependencies(secp256k1 project_secp256k1) endif ( WIN32 )