From 0669cda7c6da6d71adc1819b07aca62af4cfcbbe Mon Sep 17 00:00:00 2001 From: Ricardo Marliere Date: Fri, 21 Jul 2017 20:39:02 -0300 Subject: [PATCH] fc/FindSecp256k1: make variable names consistent This will make possible to use, as intended, an exported environment variable (SECP256K1_ROOT_DIR) to configure the Makefiles path for a custom build of libsecp256k1. --- libraries/fc/CMakeModules/FindSecp256k1.cmake | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/libraries/fc/CMakeModules/FindSecp256k1.cmake b/libraries/fc/CMakeModules/FindSecp256k1.cmake index 68716642af2..5da35d9cdd6 100644 --- a/libraries/fc/CMakeModules/FindSecp256k1.cmake +++ b/libraries/fc/CMakeModules/FindSecp256k1.cmake @@ -2,48 +2,48 @@ # # Usage of this module as follows: # -# find_package(Secp256k1) +# find_package(SECP256K1) # # Variables used by this module, they can change the default behaviour and need # to be set before calling find_package: # -# Secp256k1_ROOT_DIR Set this variable to the root installation of +# SECP256K1_ROOT_DIR Set this variable to the root installation of # secp256k1 if the module has problems finding the # proper installation path. # # Variables defined by this module: # # SECP256K1_FOUND System has secp256k1, include and lib dirs found -# Secp256k1_INCLUDE_DIR The secp256k1 include directories. -# Secp256k1_LIBRARY The secp256k1 library. +# SECP256K1_INCLUDE_DIR The secp256k1 include directories. +# SECP256K1_LIBRARY The secp256k1 library. -find_path(Secp256k1_ROOT_DIR +find_path(SECP256K1_ROOT_DIR NAMES include/secp256k1.h ) -find_path(Secp256k1_INCLUDE_DIR +find_path(SECP256K1_INCLUDE_DIR NAMES secp256k1.h - HINTS ${Secp256k1_ROOT_DIR}/include + HINTS ${SECP256K1_ROOT_DIR}/include ) -find_library(Secp256k1_LIBRARY +find_library(SECP256K1_LIBRARY NAMES secp256k1 - HINTS ${Secp256k1_ROOT_DIR}/lib + HINTS ${SECP256K1_ROOT_DIR}/lib ) -if(Secp256k1_INCLUDE_DIR AND Secp256k1_LIBRARY) +if(SECP256K1_INCLUDE_DIR AND SECP256K1_LIBRARY) set(SECP256K1_FOUND TRUE) -else(Secp256k1_INCLUDE_DIR AND Secp256k1_LIBRARY) - FIND_LIBRARY(Secp256k1_LIBRARY NAMES secp256k1) +else(SECP256K1_INCLUDE_DIR AND SECP256K1_LIBRARY) + FIND_LIBRARY(SECP256K1_LIBRARY NAMES secp256k1) include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(Secp256k1 DEFAULT_MSG Secp256k1_INCLUDE_DIR Secp256k1_LIBRARY ) - MARK_AS_ADVANCED(Secp256k1_INCLUDE_DIR Secp256k1_LIBRARY) -endif(Secp256k1_INCLUDE_DIR AND Secp256k1_LIBRARY) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(SECP256K1 DEFAULT_MSG SECP256K1_INCLUDE_DIR SECP256K1_LIBRARY ) + MARK_AS_ADVANCED(SECP256K1_INCLUDE_DIR SECP256K1_LIBRARY) +endif(SECP256K1_INCLUDE_DIR AND SECP256K1_LIBRARY) mark_as_advanced( - Secp256k1_ROOT_DIR - Secp256k1_INCLUDE_DIR - Secp256k1_LIBRARY + SECP256K1_ROOT_DIR + SECP256K1_INCLUDE_DIR + SECP256K1_LIBRARY ) -MESSAGE( STATUS "Found Secp256k1: ${Secp256k1_LIBRARY}" ) +MESSAGE( STATUS "Found SECP256K1: ${SECP256K1_LIBRARY}" )