From: Mouse Date: Tue, 27 Jun 2017 13:13:55 +0000 (-0400) Subject: Fixed sudden inability to find OpenSSL libraries by restoring manual specification of X-Git-Tag: v1.1.0.2~9^2 X-Git-Url: https://wagner.pp.ru/gitweb/?a=commitdiff_plain;ds=inline;h=0593449f7eea1ac86b2bc255652a66622a3f383f;p=openssl-gost%2Fengine.git Fixed sudden inability to find OpenSSL libraries by restoring manual specification of where they reside --- diff --git a/CMakeLists.txt b/CMakeLists.txt index b615975..239f259 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,19 +14,23 @@ else() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DL_ENDIAN") endif() +# include and lib directories for OpenSSL +set(GOST_INCLUDE_DIRECTORIES "${OPENSSL_PATH}/include") +set(GOST_LINK_DIRECTORIES "${OPENSSL_PATH}/lib") # module linker flags -//SET (CMAKE_MODULE_LINKER_FLAGS "-L${OPENSSL_PATH}" "-L${OPENSSL_PATH}/lib" $ENV{LDFLAGS} -// CACHE STRING "Flags used by the linker during the creation of modules.") +SET (CMAKE_MODULE_LINKER_FLAGS "-L${OPENSSL_PATH}/lib" $ENV{LDFLAGS} + CACHE STRING "Flags used by the linker during the creation of modules.") # exe linker flags -SET (CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS_INIT} $ENV{LDFLAGS} +SET (CMAKE_EXE_LINKER_FLAGS "-L${OPENSSL_PATH}/lib" $ENV{LDFLAGS} CACHE STRING "Flags used by the linker during the creation of executables.") # shared lib linker flags -SET (CMAKE_SHARED_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS_INIT} $ENV{LDFLAGS} +SET (CMAKE_SHARED_LINKER_FLAGS "-L${OPENSSL_PATH}/lib" $ENV{LDFLAGS} CACHE STRING "Flags used by the linker during the creation of shared libraries.") include_directories("${GOST_INCLUDE_DIRECTORIES}") +link_directories("${GOST_LINK_DIRECTORIES}") set(BIN_DIRECTORY bin)