From ba9ad0e6e9149f001ff6b8b9e1dd23800e847afb Mon Sep 17 00:00:00 2001 From: dnotestein Date: Thu, 20 Feb 2014 18:14:04 -0500 Subject: [PATCH] Move bad global include that was only included for Linux/Apple to be a private include that works for windows also (so that fc compiles under windows again). --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a31571..5b43894 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,6 @@ ELSE(WIN32) include_directories( ${Boost_INCLUDE_DIR} ) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/vendor/salsa20 ) - include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/vendor/scrypt-jane ) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/include ) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/vendor/easylzma/src ) IF(NOT APPLE ) # then unix @@ -70,6 +69,7 @@ ELSE(WIN32) ENDIF(NOT APPLE) ENDIF(WIN32) + FIND_PACKAGE( OpenSSL ) SET (CMAKE_FIND_LIBRARY_SUFFIXES ${ORIGINAL_LIB_SUFFIXES}) @@ -191,6 +191,7 @@ target_include_directories(fc ${OPENSSL_INCLUDE_DIR} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/vendor/scrypt-jane ${CMAKE_CURRENT_SOURCE_DIR}/vendor/cyoencode-1.0.2/src ${CMAKE_CURRENT_SOURCE_DIR}/vendor/boost_1.51/include ${CMAKE_CURRENT_SOURCE_DIR}/vendor/salsa20