]> wagner.pp.ru Git - openssl-gost/engine.git/commitdiff
Fixed sudden inability to find OpenSSL libraries by restoring manual specification of 32/head
authorMouse <mouse008@gmail.com>
Tue, 27 Jun 2017 13:13:55 +0000 (09:13 -0400)
committerMouse <mouse008@gmail.com>
Tue, 27 Jun 2017 13:13:55 +0000 (09:13 -0400)
where they reside

CMakeLists.txt

index b6159755ad8399822ddac77fa3b96f4566ce95e0..239f259ff26bf5db41513cb0510f092fe354d84b 100644 (file)
@@ -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)