Skip to content

Commit 1bec309

Browse files
committed
Define C++11 by default
This help the project compile with gcc 5.x
1 parent 7e54afd commit 1bec309

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

CMake/Common.cmake

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,25 @@ set(CMAKE_MINSIZEREL_POSTFIX "_ms")
1010

1111
if (WIN32)
1212
set(CMAKE_USE_RELATIVE_PATHS "1")
13-
# Set compiler flags
14-
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MP")
15-
set(CMAKE_CXX_FLAGS_RELEASE "/MD /MP /Ox /Ob2 /Oi /Ot /D NDEBUG /openmp")
13+
# Set compiler flags
14+
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MP")
15+
set(CMAKE_CXX_FLAGS_RELEASE "/MD /MP /Ox /Ob2 /Oi /Ot /D NDEBUG /openmp")
1616
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/INCREMENTAL:NO")
17-
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/INCREMENTAL:NO")
18-
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "/INCREMENTAL:NO")
17+
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/INCREMENTAL:NO")
18+
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "/INCREMENTAL:NO")
1919
endif (WIN32)
2020

2121
if (UNIX)
2222
set(CMAKE_USE_RELATIVE_PATHS "1")
23-
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
23+
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
2424
# Set compiler flags for "release"
25-
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -fopenmp")
25+
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -fopenmp")
2626
endif (UNIX)
2727

2828
if(APPLE)
29-
set(CMAKE_MACOSX_RPATH 1)
29+
set(CMAKE_MACOSX_RPATH 1)
3030
endif()
3131

32+
set (CMAKE_CXX_STANDARD 11)
33+
3234
add_definitions(-D_CRT_SECURE_NO_DEPRECATE)

0 commit comments

Comments
 (0)