Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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).

Browse source
This commit is contained in:
dnotestein 2014-02-20 18:14:04 -05:00
parent 4a786fe6d5
commit ba9ad0e6e9
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -59,7 +59,6 @@ ELSE(WIN32)
include_directories( ${Boost_INCLUDE_DIR} ) include_directories( ${Boost_INCLUDE_DIR} )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/vendor/salsa20 ) 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}/include )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/vendor/easylzma/src ) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/vendor/easylzma/src )
IF(NOT APPLE ) # then unix IF(NOT APPLE ) # then unix
@ -70,6 +69,7 @@ ELSE(WIN32)
ENDIF(NOT APPLE) ENDIF(NOT APPLE)
ENDIF(WIN32) ENDIF(WIN32)
FIND_PACKAGE( OpenSSL ) FIND_PACKAGE( OpenSSL )
SET (CMAKE_FIND_LIBRARY_SUFFIXES ${ORIGINAL_LIB_SUFFIXES}) SET (CMAKE_FIND_LIBRARY_SUFFIXES ${ORIGINAL_LIB_SUFFIXES})
@ -191,6 +191,7 @@ target_include_directories(fc
${OPENSSL_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR}
PRIVATE ${CMAKE_CURRENT_SOURCE_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/cyoencode-1.0.2/src
${CMAKE_CURRENT_SOURCE_DIR}/vendor/boost_1.51/include ${CMAKE_CURRENT_SOURCE_DIR}/vendor/boost_1.51/include
${CMAKE_CURRENT_SOURCE_DIR}/vendor/salsa20 ${CMAKE_CURRENT_SOURCE_DIR}/vendor/salsa20