From 765b3b1037ecec6c6274da2a439a09ecb8ca5702 Mon Sep 17 00:00:00 2001 From: searchivairus Date: Fri, 21 Jul 2017 20:00:56 -0400 Subject: [PATCH] Further fixes for the make --- similarity_search/CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/similarity_search/CMakeLists.txt b/similarity_search/CMakeLists.txt index 529bec1..4064296 100644 --- a/similarity_search/CMakeLists.txt +++ b/similarity_search/CMakeLists.txt @@ -42,17 +42,17 @@ if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") message(FATAL_ERROR "GCC version must be at least 4.7!") endif() # Uncomment the following lines to see how the code compiles without AVX,SSE4.2 and/or SSE2 - #set (CMAKE_CXX_FLAGS_RELEASE "-Wall -Wunreachable-code -Ofast -lm -lrt -DNDEBUG -std=c++11 -DHAVE_CXX0X -fopenmp -fpic -march=x86-64") - #set (CMAKE_CXX_FLAGS_RELEASE "-Wall -Wunreachable-code -Ofast -lm -lrt -DNDEBUG -std=c++11 -DHAVE_CXX0X -fopenmp -fpic -march=core2") - #set (CMAKE_CXX_FLAGS_RELEASE "-Wall -Wunreachable-code -Ofast -lm -lrt -DNDEBUG -std=c++11 -DHAVE_CXX0X -fopenmp -fpic -msse4.2") - set (CMAKE_CXX_FLAGS_RELEASE "-Wall -Wunreachable-code -Wcast-align -Ofast -lm -lrt -DNDEBUG -std=c++11 -fopenmp -DHAVE_CXX0X -march=native -Wl,--no-as-needed -fpic") - set (CMAKE_CXX_FLAGS_DEBUG "-Wall -Wunreachable-code -Wcast-align -ggdb -lm -lrt -DNDEBUG -std=c++11 -fopenmp -DHAVE_CXX0X -march=native -Wl,--no-as-needed -fpic") + #set (CMAKE_CXX_FLAGS_RELEASE "-Wall -Wunreachable-code -Ofast -lm -lrt -DNDEBUG -std=c++11 -DHAVE_CXX0X -fpic -march=x86-64") + #set (CMAKE_CXX_FLAGS_RELEASE "-Wall -Wunreachable-code -Ofast -lm -lrt -DNDEBUG -std=c++11 -DHAVE_CXX0X -fpic -march=core2") + #set (CMAKE_CXX_FLAGS_RELEASE "-Wall -Wunreachable-code -Ofast -lm -lrt -DNDEBUG -std=c++11 -DHAVE_CXX0X -fpic -msse4.2") + set (CMAKE_CXX_FLAGS_RELEASE "-Wall -Wunreachable-code -Wcast-align -Ofast -lm -lrt -DNDEBUG -std=c++11 -DHAVE_CXX0X -march=native -Wl,--no-as-needed -fpic") + set (CMAKE_CXX_FLAGS_DEBUG "-Wall -Wunreachable-code -Wcast-align -ggdb -lm -lrt -DNDEBUG -std=c++11 -DHAVE_CXX0X -march=native -Wl,--no-as-needed -fpic") elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel") if (CXX_COMPILER_VERSION VERSION_LESS 14.0.1) message(FATAL_ERROR "Intel version must be at least 14.0.1!") endif() - set (CMAKE_CXX_FLAGS_RELEASE "-Wall -Wunreachable-code -Ofast -lrt -DNDEBUG -std=c++11 -DHAVE_CXX0X -qopenmp -march=native -fpic") - set (CMAKE_CXX_FLAGS_DEBUG "-Wall -Wunreachable-code -ggdb -lrt -DNDEBUG -std=c++11 -DHAVE_CXX0X -qopenmp -march=native -fpic") + set (CMAKE_CXX_FLAGS_RELEASE "-Wall -Wunreachable-code -Ofast -lrt -DNDEBUG -std=c++11 -DHAVE_CXX0X -lpthread -march=native -fpic") + set (CMAKE_CXX_FLAGS_DEBUG "-Wall -Wunreachable-code -ggdb -lrt -DNDEBUG -std=c++11 -DHAVE_CXX0X -lpthread -march=native -fpic") elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") if (CXX_COMPILER_VERSION VERSION_LESS 4.2.1) message(FATAL_ERROR "Clang version must be at least 3.4 (GCC >= 4.2.1 equivalent)!") @@ -62,8 +62,8 @@ elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") set (CMAKE_CXX_FLAGS_RELEASE "-Wall -Wunreachable-code -Wcast-align -O3 -DNDEBUG -std=c++11 -DHAVE_CXX0X -fpic -march=native") set (CMAKE_CXX_FLAGS_DEBUG "-Wall -Wunreachable-code -Wcast-align -ggdb -DNDEBUG -std=c++11 -DHAVE_CXX0X -fpic -march=native") else() - set (CMAKE_CXX_FLAGS_RELEASE "-Wall -Wunreachable-code -Wcast-align -O3 -DNDEBUG -std=c++11 -DHAVE_CXX0X -fopenmp -march=native -fpic") - set (CMAKE_CXX_FLAGS_DEBUG "-Wall -Wunreachable-code -Wcast-align -ggdb -DNDEBUG -std=c++11 -DHAVE_CXX0X -fopenmp -march=native -fpic") + set (CMAKE_CXX_FLAGS_RELEASE "-Wall -Wunreachable-code -Wcast-align -O3 -DNDEBUG -std=c++11 -DHAVE_CXX0X -march=native -fpic") + set (CMAKE_CXX_FLAGS_DEBUG "-Wall -Wunreachable-code -Wcast-align -ggdb -DNDEBUG -std=c++11 -DHAVE_CXX0X -march=native -fpic") endif() #message(FATAL_ERROR "CLANG ${CMAKE_SYSTEM_NAME}") elseif(WIN32)