12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warnings by latest CMake 3.1. Variables should be unquoted: Policy CMP0054 is not set: Only interpret if() arguments as variables or keywords when unquoted.

release/4.3a0
Chris Beall 2015-01-16 09:33:02 -05:00
parent 5ea30af837
commit 7cdbac4b5c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/GtsamBuildTypes.cmake
View File

@ -54,7 +54,7 @@ if(NOT FIRST_PASS_DONE)
endif() endif()
# Clang on Mac uses a template depth that is less than standard and is too small # Clang on Mac uses a template depth that is less than standard and is too small
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
if(NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "5.0") if(NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "5.0")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024")
endif() endif()

4
gtsam/3rdparty/metis/CMakeLists.txt vendored
View File

@ -2,14 +2,14 @@ cmake_minimum_required(VERSION 2.8)
project(METIS) project(METIS)
# Add flags for currect directory and below # Add flags for currect directory and below
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
add_definitions(-Wno-unused-variable) add_definitions(-Wno-unused-variable)
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 5.0) if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 5.0)
add_definitions(-Wno-sometimes-uninitialized) add_definitions(-Wno-sometimes-uninitialized)
endif() endif()
endif() endif()
if(NOT ("${CMAKE_C_COMPILER_ID}" MATCHES "MSVC" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC")) if(NOT (${CMAKE_C_COMPILER_ID} MATCHES "MSVC" OR ${CMAKE_CXX_COMPILER_ID} MATCHES "MSVC"))
#add_definitions(-Wno-unknown-pragmas) #add_definitions(-Wno-unknown-pragmas)
endif() endif()

2
tests/CMakeLists.txt
View File

@ -2,7 +2,7 @@
# note the source dir on each # note the source dir on each
set (tests_exclude "") set (tests_exclude "")
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") # might not be best test - Richard & Jason & Frank if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") # might not be best test - Richard & Jason & Frank
# clang linker segfaults on large testSerializationSLAM # clang linker segfaults on large testSerializationSLAM
list (APPEND tests_exclude "testSerializationSLAM.cpp") list (APPEND tests_exclude "testSerializationSLAM.cpp")
endif() endif()