diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2016-05-02 06:21:21 -0500 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2016-05-02 06:21:21 -0500 |
| commit | 5a9a41ffc4a995e88ab993843e0b8d668dd41a70 (patch) | |
| tree | 7e256b3baa7386aba8b24741f6e318f8506b960f /CMakeLists.txt | |
| parent | 50b4f675ac8167626a5265df1ebdd4e26a5d882c (diff) | |
| parent | 4f42f4f6ec3699412a0bfe97fdd029ede8f8a238 (diff) | |
| download | cryptopp-git-5a9a41ffc4a995e88ab993843e0b8d668dd41a70.tar.gz | |
Merge pull request #156 from zabulus/master
Fix MSVC2015 CMakeLists.txt (Issue #99)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8003f6b6..95fdca67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ if(DISABLE_AESNI) add_definitions(-DCRYPTOPP_DISABLE_AESNI)
endif()
if(NOT CRYPTOPP_DATA_DIR STREQUAL "")
- add_definitions(-DCRYPTOPP_DATA_DIR=${CRYPTOPP_DATA_DIR})
+ add_definitions(-DCRYPTOPP_DATA_DIR="${CRYPTOPP_DATA_DIR}")
endif()
#============================================================================
@@ -78,10 +78,26 @@ set(cryptopp_SOURCES ${cryptopp_SOURCES}
)
-if(MINGW)
+if(MINGW OR WIN32)
list(APPEND cryptopp_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/winpipes.cpp)
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 /safeseh")
+ set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/x64masm.asm PROPERTIES COMPILE_FLAGS "/D_M_X86 /safeseh")
+ set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/rdrand.asm PROPERTIES COMPILE_FLAGS "/D_M_X86 /safeseh")
+ endif()
+ list(APPEND cryptopp_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/rdrand.asm)
+ enable_language(ASM_MASM)
+endif()
+
#============================================================================
# Compile targets
#============================================================================
|