Merge 8147545 into 31ed2e2

.appveyor.yml

@@ -50,6 +50,5 @@ build:
   project: C:\projects\fcl\build\fcl.sln
   parallel: true
 
-# tests seem to hang
-# test_script:
-#  - cmd: ctest -C %Configuration%
+test_script:
+  - cmd: ctest -C %Configuration%

.travis.yml

@@ -22,11 +22,6 @@ matrix:
     - os: osx
       compiler: gcc
 
-addons:
-  apt:
-    packages:
-      - libboost-all-dev
-
 install:
   # Install dependencies for FCL
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then 'ci/install_linux.sh' ; fi
@@ -41,7 +36,7 @@ script:
   - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DFCL_COVERALLS=$COVERALLS ..
 
   # Build
-  - make -j4
+  - make -j2
   - if [ $COVERALLS = ON ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then make coveralls; fi
 
   # Run unit tests

CMakeLists.txt

@@ -9,24 +9,12 @@ endif()
 
 project(fcl CXX C)
 
+option(FCL_ENABLE_PROFILING "Enable profiling" OFF)
 option(FCL_TREAT_WARNINGS_AS_ERRORS "Treat warnings as errors" OFF)
 
 # set the default build type
-if (NOT CMAKE_BUILD_TYPE)
-   set(CMAKE_BUILD_TYPE Release)
-endif()
-
-# Set build type variable
-set(FCL_BUILD_TYPE_RELEASE FALSE)
-set(FCL_BUILD_TYPE_DEBUG FALSE)
-
-string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_UPPERCASE)
-if("${CMAKE_BUILD_TYPE_UPPERCASE}" STREQUAL "RELEASE")
-  set(FCL_BUILD_TYPE_RELEASE TRUE)
-elseif("${CMAKE_BUILD_TYPE_UPPERCASE}" STREQUAL "DEBUG")
-  set(FCL_BUILD_TYPE_DEBUG TRUE)
-else()
-  message(STATUS "CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} unknown. Valid options are: Debug Release")
+if (NOT MSVC AND NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Release)
 endif()
 
 # This shouldn't be necessary, but there has been trouble

CMakeModules/CompilerSettings.cmake

@@ -1,6 +1,6 @@
 # GCC
 if(CMAKE_COMPILER_IS_GNUCXX)
-    add_definitions(-std=c++11 -W -Wall -g -Wextra -Wno-missing-field-initializers -Wno-unused-parameter)
+    add_definitions(-std=c++11 -W -Wall -g -Wextra -Wpedantic -Wno-missing-field-initializers -Wno-unused-parameter)
     if(FCL_TREAT_WARNINGS_AS_ERRORS)
         add_definitions(-Werror)
     endif(FCL_TREAT_WARNINGS_AS_ERRORS)
@@ -16,7 +16,7 @@ endif()
 
 # Visual Studio
 if(MSVC OR MSVC90 OR MSVC10)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /MP /W1")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /MP /W1 /bigobj")
     if(FCL_TREAT_WARNINGS_AS_ERRORS)
         add_definitions(/WX)
     endif(FCL_TREAT_WARNINGS_AS_ERRORS)

ci/install_osx.sh

@@ -6,3 +6,13 @@ brew install git
 brew install cmake
 brew install eigen
 brew install libccd
+
+# Octomap
+git clone https://github.com/OctoMap/octomap
+cd octomap
+git checkout tags/v1.8.0
+mkdir build
+cd build
+cmake ..
+make
+sudo make install