arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix MSVC2015 (win64) CMakeLists.txt issues #99

pull/156/head
zabulus 2016-04-07 13:50:09 +03:00
parent ff24f4e66e
commit 1a8dac33a2
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
CMakeLists.txt
View File

@ -9,7 +9,6 @@ set(cryptopp_VERSION_PATCH 3)
include(GNUInstallDirs) include(GNUInstallDirs)
include(TestBigEndian) include(TestBigEndian)
include(CheckCXXSymbolExists) include(CheckCXXSymbolExists)
#============================================================================ #============================================================================
# Settable options # Settable options
#============================================================================ #============================================================================
@ -48,7 +47,7 @@ if(DISABLE_AESNI)
add_definitions(-DCRYPTOPP_DISABLE_AESNI) add_definitions(-DCRYPTOPP_DISABLE_AESNI)
endif() endif()
if(NOT CRYPTOPP_DATA_DIR STREQUAL "") if(NOT CRYPTOPP_DATA_DIR STREQUAL "")
add_definitions(-DCRYPTOPP_DATA_DIR=${CRYPTOPP_DATA_DIR}) add_definitions(-DCRYPTOPP_DATA_DIR="${CRYPTOPP_DATA_DIR}")
endif() endif()
#============================================================================ #============================================================================
@ -78,10 +77,26 @@ set(cryptopp_SOURCES
${cryptopp_SOURCES} ${cryptopp_SOURCES}
) )
if(MINGW) if(MINGW OR WIN32)
list(APPEND cryptopp_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/winpipes.cpp) list(APPEND cryptopp_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/winpipes.cpp)
endif() endif()
if(MSVC AND NOT DISABLE_ASM)
if(CMAKE_CL_64)
list(APPEND cryptopp_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/x64dll.asm)
list(APPEND cryptopp_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/x64masm.asm)
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/x64dll.asm PROPERTIES COMPILE_FLAGS "/D_M_X64")
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/x64masm.asm PROPERTIES COMPILE_FLAGS "/D_M_X64")
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/rdrand.asm PROPERTIES COMPILE_FLAGS "/D_M_X64")
else()
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/x64dll.asm PROPERTIES COMPILE_FLAGS "/D_M_X86")
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/x64masm.asm PROPERTIES COMPILE_FLAGS "/D_M_X86")
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/rdrand.asm PROPERTIES COMPILE_FLAGS "/D_M_X86")
endif()
list(APPEND cryptopp_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/rdrand.asm)
enable_language(ASM_MASM)
endif()
#============================================================================ #============================================================================
# Compile targets # Compile targets
#============================================================================ #============================================================================
@ -92,8 +107,8 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set_target_properties(cryptopp-object PROPERTIES POSITION_INDEPENDENT_CODE TRUE) set_target_properties(cryptopp-object PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
endif() endif()
add_library(cryptopp-static STATIC $<TARGET_OBJECTS:cryptopp-object>) add_library(cryptopp-static STATIC $<TARGET_OBJECTS:cryptopp-object> )
add_library(cryptopp-shared SHARED $<TARGET_OBJECTS:cryptopp-object>) add_library(cryptopp-shared SHARED $<TARGET_OBJECTS:cryptopp-object> )
target_include_directories(cryptopp-shared PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:include/cryptopp>) target_include_directories(cryptopp-shared PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:include/cryptopp>)
target_include_directories(cryptopp-static PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:include/cryptopp>) target_include_directories(cryptopp-static PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:include/cryptopp>)