Commit ad3f7f46 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

CMakeLists.txt: cleaned up compiler options

parent 9bd292a6

CMakeLists.txt

+37 −27
Original line number Diff line number Diff line
@@ -33,17 +33,21 @@ if( CMAKE_BUILD_TYPE STREQUAL "Debug") 
    set( LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/Debug/lib )

    set( EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/Debug/bin )

    set( debugExt -dbg )

    set( CXX_FLAGS "${CXXFLAGS} -g ")

    #AddCompilerFlag( "-g" )

else()

    set( PROJECT_BUILD_PATH ${PROJECT_SOURCE_DIR}/Release/src )

    set( PROJECT_TESTS_PATH ${PROJECT_SOURCE_DIR}/Release/tests )

    set( PROJECT_TOOLS_PATH ${PROJECT_SOURCE_DIR}/Release/tools )

    set( LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/Release/lib)

    set( EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/Release/bin)

    #OptimizeForArchitecture()

    AddCompilerFlag( "-O3 -march=native -DNDEBUG -g" )

endif()

# set Debug/Release options

set( CMAKE_CXX_FLAGS "-std=c++11" )

set( CMAKE_CXX_FLAGS_DEBUG "-g" )

set( CMAKE_CXX_FLAGS_RELEASE "-O3 -march=native -DNDEBUG" )

# pass -rdynamic only in Debug mode

set( CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "" )

set( CMAKE_SHARED_LIBRARY_LINK_C_FLAGS_DEBUG "-rdynamic" )

set( CMAKE_SHARED_LIBRARY_LINK_C_FLAGS_RELEASE "" )



#####

# Check for CUDA
@@ -143,14 +147,8 @@ if( WITH_CUDA STREQUAL "yes" ) 
           endif()            

        endif( NOT WITH_CUSPARSE STREQUAL "no" )

   

    else( CUDA_FOUND )

      AddCompilerFlag( "-std=c++11" )         

    endif( CUDA_FOUND )

else( WITH_CUDA STREQUAL "yes" )

   #AddCompilerFlag( "-std=gnu++0x -ftree-vectorizer-verbose=1" )       

   AddCompilerFlag( "-std=c++11" )       

endif( WITH_CUDA STREQUAL "yes" )

AddCompilerFlag( "-std=c++11" )       



####

# Check for OpenMP
@@ -158,7 +156,7 @@ AddCompilerFlag( "-std=c++11" ) 
find_package( OpenMP ) 

if( OPENMP_FOUND )

   message( "Compiler supports OpenMP." )

   #set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_OPENMP -fopenmp")

   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_OPENMP -fopenmp" )

endif()



####
@@ -312,7 +310,6 @@ endif( WITH_TESTS STREQUAL "yes" ) 
#

if( WITH_TEMPLATE_INSTANTIATION STREQUAL "yes" )

   AddCompilerFlag( "-DTEMPLATE_EXPLICIT_INSTANTIATION " )

endif()   



   if( INSTANTIATE_INT STREQUAL "yes" )

      AddCompilerFlag( "-DINSTANTIATE_INT " )
@@ -333,6 +330,7 @@ endif() 
   if( INSTANTIATE_LONG_DOUBLE STREQUAL "yes" )

      AddCompilerFlag( "-DINSTANTIATE_LONG_DOUBLE " )

   endif()

endif()



set( CXX_TEST_FLAGS "-fprofile-arcs -ftest-coverage" )

set( LD_TEST_FLAGS "-lgcov -coverage" )
@@ -382,3 +380,15 @@ set(CPACK_SOURCE_STRIP_FILES "Release") 


#set(CPACK_PACKAGE_EXECUTABLES "MyExecutable" "My Executable")

INCLUDE( CPack )



# Print compiler options

message( "-- Compiler options:" )

message( "   CMAKE_CXX_FLAGS = ${CMAKE_CXX_FLAGS}" )

message( "   CMAKE_CXX_FLAGS_DEBUG = ${CMAKE_CXX_FLAGS_DEBUG}" )

message( "   CMAKE_CXX_FLAGS_RELEASE = ${CMAKE_CXX_FLAGS_RELEASE}" )

message( "   CMAKE_SHARED_LIBRARY_LINK_C_FLAGS = ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS}" )

message( "   CMAKE_SHARED_LIBRARY_LINK_C_FLAGS_DEBUG = ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS_DEBUG}" )

message( "   CMAKE_SHARED_LIBRARY_LINK_C_FLAGS_RELEASE = ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS_RELEASE}" )

message( "   CUDA_ADD_EXECUTABLE_OPTIONS ${CUDA_ADD_EXECUTABLE_OPTIONS}" )

message( "   CUDA_ADD_LIBRARY_OPTIONS ${CUDA_ADD_LIBRARY_OPTIONS}" )

message( "   CUDA_LINKER_OPTIONS ${CUDA_LINKER_OPTIONS}" )