From: Mouse <mouse008@gmail.com>
Date: Tue, 27 Jun 2017 12:34:04 +0000 (-0400)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v1.1.0.2~9^2~1
X-Git-Url: https://wagner.pp.ru/gitweb/?a=commitdiff_plain;ds=inline;h=89e6ee7aadbb8cf4b4fdb81e38b5e0a7cc5f598a;p=openssl-gost%2Fengine.git

Merge remote-tracking branch 'upstream/master'
---

89e6ee7aadbb8cf4b4fdb81e38b5e0a7cc5f598a
diff --cc CMakeLists.txt
index dfcd774,76e51b4..b615975
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -14,23 -14,6 +14,20 @@@ else(
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DL_ENDIAN")
  endif()
  
- set(GOST_INCLUDE_DIRECTORIES "${OPENSSL_PATH}/include" "${OPENSSL_PATH}/crypto/include")
- 
- set(GOST_LINK_DIRECTORIES "${OPENSSL_PATH}")
 +
 +# 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}" "-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}
 +     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}
 +     CACHE STRING "Flags used by the linker during the creation of shared libraries.")
 +
 +
 +include_directories("${GOST_INCLUDE_DIRECTORIES}")
 +
  set(BIN_DIRECTORY bin)
  
  set(OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/${BIN_DIRECTORY})