Skip to content
Snippets Groups Projects
Commit 306a3d72 authored by René Fritze's avatar René Fritze
Browse files

[cmake] fix boost location, disable lto

parent d8260f4a
No related branches found
No related tags found
No related merge requests found
...@@ -129,7 +129,11 @@ CHECK_INCLUDE_FILE_CXX("malloc.h" HAVE_MALLOC_H) ...@@ -129,7 +129,11 @@ CHECK_INCLUDE_FILE_CXX("malloc.h" HAVE_MALLOC_H)
SET( CUSTOM_FLAGS SET( CUSTOM_FLAGS
"-Wall -Wextra -pedantic -O3 -DDNDEBUG -funroll-loops -g -ggdb -DENABLE_ADAPTIVE=1 -DADAPTIVE_SOLVER -DUSE_BFG_CG_SCHEME -fno-strict-aliasing" CACHE STRING "-Wall -Wextra -pedantic -O3 -DDNDEBUG -funroll-loops -g -ggdb -DENABLE_ADAPTIVE=1 -DADAPTIVE_SOLVER -DUSE_BFG_CG_SCHEME -fno-strict-aliasing" CACHE STRING
"CUSTOM FLAGS") "CUSTOM FLAGS")
FIND_PACKAGE(Boost 1.35.0 REQUIRED) SET( BOOST_ROOT
"/opt/boost-1.48" CACHE STRING
"" )
FIND_PACKAGE(Boost 1.48.0 REQUIRED)
INCLUDE_DIR(${Boost_INCLUDE_DIR}) INCLUDE_DIR(${Boost_INCLUDE_DIR})
FIND_PACKAGE( PkgConfig ) FIND_PACKAGE( PkgConfig )
pkg_check_modules( CCGNU REQUIRED libccgnu2 ) pkg_check_modules( CCGNU REQUIRED libccgnu2 )
...@@ -137,13 +141,13 @@ ADD_CXX_FLAGS( "${CCGNU_CFLAGS}") ...@@ -137,13 +141,13 @@ ADD_CXX_FLAGS( "${CCGNU_CFLAGS}")
INCLUDE_SYS_DIR(${Boost_INCLUDE_DIR}) INCLUDE_SYS_DIR(${Boost_INCLUDE_DIR})
#try to enable link-time-optimisation #try to enable link-time-optimisation
if (CMAKE_COMPILER_IS_GNUCC) # if (CMAKE_COMPILER_IS_GNUCC)
execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) # execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
if (GCC_VERSION VERSION_GREATER 4.5 OR GCC_VERSION VERSION_EQUAL 4.5) # if (GCC_VERSION VERSION_GREATER 4.5 OR GCC_VERSION VERSION_EQUAL 4.5)
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto") # set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flto") # set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flto")
set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -flto") # set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -flto")
endif() # endif()
endif() # endif()
ENABLE_TESTING() ENABLE_TESTING()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment