Skip to content
Snippets Groups Projects

Merging develop

Merged Merging develop
develop into master
Merged
Mateusz Gniewkowskirequested to merge
develop into master
Compare
and
1 file
+ 1
− 0
Compare changes
  • Side-by-side
  • Inline
CMakeLists.txt
+ 1
− 0
@@ -43,6 +43,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
@@ -43,6 +43,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
FORCE)
FORCE)
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -fno-omit-frame-pointer"
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -fno-omit-frame-pointer"
CACHE STRING "Flags used by the CXX compiler during relwithdebiginfo builds" FORCE)
CACHE STRING "Flags used by the CXX compiler during relwithdebiginfo builds" FORCE)
 
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
endif(NOT CONFIGURED)
endif(NOT CONFIGURED)
endif(CMAKE_COMPILER_IS_GNUCXX)
endif(CMAKE_COMPILER_IS_GNUCXX)