aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMouse <mouse008@gmail.com>2017-06-27 09:13:55 -0400
committerMouse <mouse008@gmail.com>2017-06-27 09:13:55 -0400
commit0593449f7eea1ac86b2bc255652a66622a3f383f (patch)
treea4ede427824e78479e1e6a78f2d03e374b0c5df6
parent89e6ee7aadbb8cf4b4fdb81e38b5e0a7cc5f598a (diff)
downloadgost-engine-0593449f7eea1ac86b2bc255652a66622a3f383f.zip
gost-engine-0593449f7eea1ac86b2bc255652a66622a3f383f.tar.gz
gost-engine-0593449f7eea1ac86b2bc255652a66622a3f383f.tar.bz2
Fixed sudden inability to find OpenSSL libraries by restoring manual specification of
where they reside
-rw-r--r--CMakeLists.txt12
1 files changed, 8 insertions, 4 deletions
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)