Merge 26e2a2e into fe0e401

.travis.yml

@@ -18,12 +18,15 @@ before_install:
 before_script:
   - sudo apt-get update -qq
   - sudo apt-get install -y libqt4-dev libqglviewer-dev gcovr freeglut3-dev
-  - ls /usr/share/cmake-3.9.2/Modules | grep cmake
+  - ls /usr/share/cmake-2.8/Modules | grep cmake
+  - ls /usr/local/cmake-3.9.2/
+  - ls /usr/local/cmake-3.9.2/share/cmake-3.9/
+  - ls /usr/local/cmake-3.9.2/share/cmake-3.9/Modules
   - mkdir build
   - cd build
 
 script:
-  - cmake .. -DBUILD_WITH_COVERAGE=YES -DCMAKE_MODULE_PATH=/usr/share/cmake-3.9.2/Modules
+  - cmake .. -DBUILD_WITH_COVERAGE=YES
   - make -j8
   - ctest -VV
   - gcovr  -r `pwd`/../src/ .

CMakeLists.txt

@@ -1,33 +1,28 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.1)
 project(depth_clustering)
 
 include(DistVersion.cmake)
 system_info(DISTRO)
 message(STATUS "DISTRO: ${DISTRO}")
 
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
 if(NOT CMAKE_BUILD_TYPE)
-  set(POSSIBLE_BUILD_TYPES "Debug Release RelWithDebInfo MinSizeRel")
-  set(CMAKE_BUILD_TYPE "Release" CACHE STRING
-      "Choose the type of build, options are: ${POSSIBLE_BUILD_TYPES}." FORCE)
-endif(NOT CMAKE_BUILD_TYPE)
-message(STATUS "CMAKE_BUILD_TYPE: " ${CMAKE_BUILD_TYPE})
-
-include(CheckCXXCompilerFlag)
-CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
-CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
-if(COMPILER_SUPPORTS_CXX11)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-elseif(COMPILER_SUPPORTS_CXX0X)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-else()
-    message(WARNING "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support.")
-    message(STATUS "Please use a different C++ compiler.")
+  set(CMAKE_BUILD_TYPE Release)
 endif()
 
-# enable warnings
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall")
+set( CMAKE_CXX_FLAGS "-Wall -Wextra -fPIC")
+set( CMAKE_CXX_FLAGS_DEBUG "-g -O0")
+set( CMAKE_CXX_FLAGS_RELEASE "-O3")
+
 
-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake_modules)
+SET(CMAKE_MODULE_PATH
+      ${CMAKE_MODULE_PATH}
+      ${PROJECT_SOURCE_DIR}/cmake_modules
+      "/usr/share/cmake-2.8/Modules"  ## Hack for travis
+    )
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib)