diff options
author | Mouse <mouse008@gmail.com> | 2017-06-27 08:34:04 -0400 |
---|---|---|
committer | Mouse <mouse008@gmail.com> | 2017-06-27 08:34:04 -0400 |
commit | 89e6ee7aadbb8cf4b4fdb81e38b5e0a7cc5f598a (patch) | |
tree | 4f503f650ee44115779b3b3198d07e78fcbf46c8 | |
parent | b616bb8e764ca37c9e2c45e79e875ca55aab7d37 (diff) | |
parent | c969f2945cf1e08f72021774ecb89ff29b9a6448 (diff) | |
download | gost-engine-89e6ee7aadbb8cf4b4fdb81e38b5e0a7cc5f598a.zip gost-engine-89e6ee7aadbb8cf4b4fdb81e38b5e0a7cc5f598a.tar.gz gost-engine-89e6ee7aadbb8cf4b4fdb81e38b5e0a7cc5f598a.tar.bz2 |
Merge remote-tracking branch 'upstream/master'
-rw-r--r-- | CMakeLists.txt | 9 | ||||
-rw-r--r-- | CMake_ReadMe.md | 22 |
2 files changed, 15 insertions, 16 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) diff --git a/CMake_ReadMe.md b/CMake_ReadMe.md index b3bfca1..b708505 100644 --- a/CMake_ReadMe.md +++ b/CMake_ReadMe.md @@ -1,21 +1,25 @@ ## CMake Config -Required variables: -1. `OPENSSL_PATH` - full path to local [openssl](https://github.com/openssl/openssl) source tree +Configuring with `cmake` is can very simply be done like this: -For Example: +~~~ bash +cmake . +~~~ + +If you want to build against a specific OpenSSL installation (if you have +more than one, or your own private install, or...), you can use the `cmake` +variable `CMAKE_C_FLAGS`: -~~~bash -cmake -DOPENSSL_PATH=/home/user/openssl . +~~~ bash +cmake -DCMAKE_C_FLAGS='-I/PATH/TO/OPENSSL/include -L/PATH/TO/OPENSSL/lib' . ~~~ -Build Example: +Build example: -~~~bash -cd ~/gost-engine +~~~ bash mkdir build cd build -cmake -DOPENSSL_PATH=/home/user/openssl .. +cmake -DCMAKE_C_FLAGS='-I/PATH/TO/OPENSSL/include -L/PATH/TO/OPENSSL/lib' .. make -j 8 cd ../bin ~~~ |