Merge remote-tracking branch 'upstream/master'

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
 ~~~