X-Git-Url: https://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=b6159755ad8399822ddac77fa3b96f4566ce95e0;hb=89e6ee7aadbb8cf4b4fdb81e38b5e0a7cc5f598a;hp=4b50a42539c22df39c8b4b6c68c271f4db713ff4;hpb=fcb061fdde69cbd9148d9af3fd3129a21e7c2177;p=openssl-gost%2Fengine.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b50a42..b615975 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,9 +14,17 @@ 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.")
+# 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}")
 
@@ -24,7 +32,7 @@ set(BIN_DIRECTORY bin)
 
 set(OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/${BIN_DIRECTORY})
 
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_DIRECTORY})
+#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_DIRECTORY})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_DIRECTORY})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_DIRECTORY})
 
@@ -80,23 +88,27 @@ set(GOST_EC_SOURCE_FILES
         gost_ec_sign.c
         )
 
-set(GOST_ENGINE_SOURCE_FILES
-        ${GOST_CORE_SOURCE_FILES}
+set(GOST_LIB_SOURCE_FILES
         ${GOST_EC_SOURCE_FILES}
         ${GOST_89_SOURCE_FILES}
-        gost_ameth.c
-        gost_md.c
-        gost_md2012.c
-        gost_pmeth.c
         ${GOST_HASH_SOURCE_FILES}
         ${GOST_GRASSHOPPER_SOURCE_FILES}
         ${GOST_HASH_2012_SOURCE_FILES})
 
-link_directories(${GOST_LINK_DIRECTORIES})
+set(GOST_ENGINE_SOURCE_FILES
+        ${GOST_CORE_SOURCE_FILES}
+        gost_ameth.c
+        gost_md.c
+        gost_md2012.c
+        gost_pmeth.c)
+
+add_library(gost STATIC ${GOST_LIB_SOURCE_FILES})
+set_target_properties(gost PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
-add_library(gost_engine SHARED ${GOST_ENGINE_SOURCE_FILES})
+add_library(gost_engine MODULE ${GOST_ENGINE_SOURCE_FILES})
+set_target_properties(gost_engine PROPERTIES PREFIX "" OUTPUT_NAME "gost")
 
-target_link_libraries(gost_engine crypto)
+target_link_libraries(gost_engine crypto gost)
 
 set(GOST_12_SUM_SOURCE_FILES
         gost12sum.c
@@ -104,7 +116,7 @@ set(GOST_12_SUM_SOURCE_FILES
 
 add_executable(gost12sum ${GOST_12_SUM_SOURCE_FILES})
 
-target_link_libraries(gost12sum gost_engine)
+target_link_libraries(gost12sum gost)
 
 set(GOST_SUM_SOURCE_FILES
         gostsum.c
@@ -112,7 +124,7 @@ set(GOST_SUM_SOURCE_FILES
 
 add_executable(gostsum ${GOST_SUM_SOURCE_FILES})
 
-target_link_libraries(gostsum gost_engine)
+target_link_libraries(gostsum gost)
 
 set(GOST_SUM_12_SOURCE_FILES
         gostsum12.c
@@ -120,4 +132,4 @@ set(GOST_SUM_12_SOURCE_FILES
 
 add_executable(gostsum12 ${GOST_SUM_12_SOURCE_FILES})
 
-target_link_libraries(gostsum12 gost_engine)
+target_link_libraries(gostsum12 gost)