aboutsummaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorMouse <mouse008@gmail.com>2017-06-27 08:34:04 -0400
committerMouse <mouse008@gmail.com>2017-06-27 08:34:04 -0400
commit89e6ee7aadbb8cf4b4fdb81e38b5e0a7cc5f598a (patch)
tree4f503f650ee44115779b3b3198d07e78fcbf46c8 /CMakeLists.txt
parentb616bb8e764ca37c9e2c45e79e875ca55aab7d37 (diff)
parentc969f2945cf1e08f72021774ecb89ff29b9a6448 (diff)
downloadgost-engine-89e6ee7aadbb8cf4b4fdb81e38b5e0a7cc5f598a.zip
gost-engine-89e6ee7aadbb8cf4b4fdb81e38b5e0a7cc5f598a.tar.gz
gost-engine-89e6ee7aadbb8cf4b4fdb81e38b5e0a7cc5f598a.tar.bz2
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt9
1 files changed, 2 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dfcd774..b615975 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,13 +14,10 @@ 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.")
@@ -105,8 +102,6 @@ set(GOST_ENGINE_SOURCE_FILES
gost_md2012.c
gost_pmeth.c)
-link_directories(${GOST_LINK_DIRECTORIES})
-
add_library(gost STATIC ${GOST_LIB_SOURCE_FILES})
set_target_properties(gost PROPERTIES POSITION_INDEPENDENT_CODE ON)