rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

crypto++ -- removed -DCRYPTOPP_DISABLE_ASM from windows 32-bit (unix only now) and moved -Wno-tautological-compare to osx 10.7 and up only.

This commit is contained in:
Nick Bolton 2013-04-11 03:18:40 +00:00
parent 08318e52ff
commit 342c94cab2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/CMakeLists.txt
View File

@ -46,15 +46,17 @@ if (CMAKE_CL_64)
"${CMAKE_CURRENT_SOURCE_DIR}/${cpp_dir}/x64masm.asm" "${CMAKE_CURRENT_SOURCE_DIR}/${cpp_dir}/x64masm.asm"
MAIN_DEPENDENCY ${cpp_dir}/x64masm.asm MAIN_DEPENDENCY ${cpp_dir}/x64masm.asm
VERBATIM) VERBATIM)
else()
add_definitions(-DCRYPTOPP_DISABLE_ASM)
endif() endif()
if (UNIX) if (UNIX)
add_definitions(-DCRYPTOPP_DISABLE_ASM)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pipe") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pipe")
if (APPLE) if (APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch x86_64 -arch i386 -Wno-tautological-compare") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch x86_64 -arch i386")
if (DARWIN_VERSION GREATER 10)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-tautological-compare")
endif()
else() else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
endif() endif()