Fixed CMake 3.0+ warnings

MRPT · Jan 11, 2015 · 87c4e6f · 87c4e6f
1 parent 553ff85
commit 87c4e6f
Show file tree

Hide file tree

Showing 137 changed files with 809 additions and 425 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,34 @@
 PROJECT(MRPT)
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4)
-include(cmakemodules/script_init_cmake.cmake REQUIRED)		# CMake tweaks
+
+# -------------------------
+#        Setup CMake
+# -------------------------
+#include(cmakemodules/script_init_cmake.cmake REQUIRED)		# CMake tweaks
+# Allow empty endif() and such with CMake 2.4.
+SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS 1)
+
+if(COMMAND cmake_policy)
+	# We don't want to mix relative and absolute paths in linker lib lists.
+	cmake_policy(SET CMP0003 NEW)
+	if(POLICY CMP0053)
+		cmake_policy(SET CMP0053 OLD) # Simplify variable reference and escape sequence evaluation. 
+	endif()
+	if(POLICY CMP0026)
+		cmake_policy(SET CMP0026 OLD) # Allow using the LOCATION target property.
+	endif()
+	if(POLICY CMP0037)
+		cmake_policy(SET CMP0037 OLD)  # Allow defining target "test"
+	endif()
+	if(POLICY CMP0043)
+		cmake_policy(SET CMP0043 OLD) #  Ignore COMPILE_DEFINITIONS_<Config> properties.
+	endif()
+
+endif()
+# -------------------------
+
+
 include(cmakemodules/script_version_number.cmake REQUIRED)	#  Loads MRPT version number
 
 LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmakemodules") # Directory for CMake scripts
@@ -96,16 +123,16 @@ ENDIF(BUILD_SHARED_LIBS)
 # ===================================================
 INCLUDE(FindPkgConfig OPTIONAL)
 # "QUIET" was introduced in 2.8.2 for PKG_CHECK_MODULES
-if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER "2.8.1")
+if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.1)
    set(_QUIET QUIET)
-endif ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER "2.8.1")
+endif()
 
 
 # Group projects in "folders"
 # ===================================================
-IF (CMAKE_VERSION VERSION_GREATER "2.8.0")
+IF (CMAKE_VERSION VERSION_GREATER 2.8.0)
 	SET(ENABLE_SOLUTION_FOLDERS ON CACHE BOOL "Group projects under virtual folders of the compiler IDE (e.g. VisualStudio)")
-ENDIF (CMAKE_VERSION VERSION_GREATER "2.8.0")
+ENDIF (CMAKE_VERSION VERSION_GREATER 2.8.0)
 
 if (ENABLE_SOLUTION_FOLDERS)
   set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -115,9 +142,9 @@ endif (ENABLE_SOLUTION_FOLDERS)
 
 # Build the ARIA library?
 SET(DEFAULT_BUILD_ARIA ON) # Default: Yes
-if ("${CMAKE_MRPT_KERNEL}" MATCHES "GNU")   # Unless in HURD
+if (${CMAKE_MRPT_KERNEL} MATCHES "GNU")   # Unless in HURD
 	SET(DEFAULT_BUILD_ARIA OFF)
-endif ("${CMAKE_MRPT_KERNEL}" MATCHES "GNU")
+endif ()
 # Decl option:
 SET(BUILD_ARIA ${DEFAULT_BUILD_ARIA} CACHE BOOL "Build an embedded version of ActivMedia ARIA library (interface to mobile robots)")
 IF(BUILD_ARIA)
@@ -128,9 +155,9 @@ ENDIF(BUILD_ARIA)
 
 # Build the RoboPeak Lidar library?
 SET(DEFAULT_BUILD_ROBOPEAK_LIDAR ON) # Default: Yes
-if ("${CMAKE_MRPT_KERNEL}" MATCHES "GNU")   # Unless in HURD
+if (${CMAKE_MRPT_KERNEL} MATCHES "GNU")   # Unless in HURD
 	SET(DEFAULT_BUILD_ROBOPEAK_LIDAR OFF)
-endif ("${CMAKE_MRPT_KERNEL}" MATCHES "GNU")
+endif (${CMAKE_MRPT_KERNEL} MATCHES "GNU")
 # Decl option:
 SET(BUILD_ROBOPEAK_LIDAR ${DEFAULT_BUILD_ROBOPEAK_LIDAR} CACHE BOOL "Build an embedded version of RoboPeak LIDAR SDK (interface to low-cost lidar)")
 IF(BUILD_ROBOPEAK_LIDAR)
@@ -331,9 +358,9 @@ MARK_AS_ADVANCED(MRPT_WHOLE_PROGRAM_OPTIMIZATION)
 # Even more warnings for different compilers
 IF(MRPT_EXTRA_WARNINGS)
    #TODO - Add options for MSVC
-   IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+   IF (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wreturn-type -Wextra") # -Wold-style-cast  -Woverloaded-virtual
-   ELSEIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+   ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
 		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
 	ENDIF()
 ENDIF(MRPT_EXTRA_WARNINGS)
@@ -432,7 +459,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 # CLang options ================================
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
 	SET( MRPT_BUILD_CLANG_PEDANTIC OFF CACHE BOOL "Enable pedantic error detection (clang)")
 	MARK_AS_ADVANCED(MRPT_BUILD_CLANG_PEDANTIC)
 
@@ -457,12 +484,11 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 	# This is to fix the compilation of C++ templates
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdelayed-template-parsing")
 
-endif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+endif()
 
 # Shared options between GCC and CLANG:
 # ======================================
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR CMAKE_COMPILER_IS_GNUCXX)
-
+if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR CMAKE_COMPILER_IS_GNUCXX)
 	IF(MRPT_WARNINGS_ARE_ERRORS)
 		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
 		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
@@ -547,7 +573,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR CMAKE_COMPILER_IS_GNUCXX)
 		SET(EXTRA_CPP_FLAGS "${EXTRA_CPP_FLAGS} -msse4a")
 	ENDIF(CMAKE_MRPT_HAS_SSE4_A)
 
-endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR CMAKE_COMPILER_IS_GNUCXX)
+endif ()
 
 # Add user supplied extra options (optimization, etc...)
 # ==========================================================
@@ -646,9 +672,9 @@ IF( BUILD_TESTING)
 	# Try using libgtest (Google testing library) from the system, if available
 	# Note: In gtest 1.6.0 things changed and there's no prebuilt system lib anymore.
 	# TODO: Is it possible to compile here the /usr/src/gtest/ sources??
-	IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND APPLE)
+	IF(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" AND APPLE)
 		add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=1)
-	ENDIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND APPLE)
+	ENDIF()
 	add_subdirectory(${CMAKE_MRPT_GTEST_SRC_DIR})  # Build gtest from sources
 	add_subdirectory(tests)  # Build my tests
 ENDIF( BUILD_TESTING)

diff --git a/cmakemodules/DeclareAppDependencies.cmake b/cmakemodules/DeclareAppDependencies.cmake
@@ -36,12 +36,12 @@ macro(DeclareAppDependencies name)
 
 		FOREACH (_DEP ${ALL_DEPS})
 			# Link:
-			IF(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+			IF(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
 				get_property(_LIB_HDRONLY GLOBAL PROPERTY "${_DEP}_LIB_IS_HEADERS_ONLY")
 				if (NOT _LIB_HDRONLY)
 					TARGET_LINK_LIBRARIES(${name} ${_DEP}${MRPT_LINKER_LIBS_POSTFIX})
 				endif (NOT _LIB_HDRONLY)
-			ENDIF(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+			ENDIF()
 
 			# Include:
 			STRING(REGEX REPLACE "mrpt-(.*)" "\\1" DEP_MRPT_NAME ${_DEP})
@@ -56,7 +56,7 @@ macro(DeclareAppDependencies name)
 			endif (${BUILD_mrpt-${DEP_MRPT_NAME}} STREQUAL "OFF")
 
 		ENDFOREACH (_DEP)
-	ENDIF (NOT "${ALL_DEPS}" STREQUAL "")
+	ENDIF ()
 
 	# Impossible to build? 
 	if (NOT AUX_ALL_DEPS_BUILD)

diff --git a/cmakemodules/DeclareMRPTLib.cmake b/cmakemodules/DeclareMRPTLib.cmake
@@ -171,13 +171,13 @@ macro(internal_define_mrpt_lib name headers_only is_metalib)
 
 				# Link "-lmrpt-name", only for GCC/CLang and if both THIS and the dependence are non-header-only:
 				IF(NOT ${headers_only})
-					IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR CMAKE_COMPILER_IS_GNUCXX)
+					IF(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR CMAKE_COMPILER_IS_GNUCXX)
 						get_property(_LIB_HDRONLY GLOBAL PROPERTY "${DEP}_LIB_IS_HEADERS_ONLY")
 						IF(NOT _LIB_HDRONLY)
 							#MESSAGE(STATUS "adding link dep: mrpt-${name} -> ${DEP}")
 							LIST(APPEND AUX_EXTRA_LINK_LIBS ${DEP}${MRPT_LINKER_LIBS_POSTFIX})
 						ENDIF(NOT _LIB_HDRONLY)
-					ENDIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR CMAKE_COMPILER_IS_GNUCXX)
+					ENDIF()
 				ENDIF(NOT ${headers_only})
 
 				# Append to list of mrpt-* lib dependences:

diff --git a/cmakemodules/MRPTPCHSupport.cmake b/cmakemodules/MRPTPCHSupport.cmake
@@ -159,11 +159,11 @@ MACRO(ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use )
   # and _pch_output_to_use
   GET_FILENAME_COMPONENT(_name ${_input} NAME)
 
-  IF( "${ARGN}" STREQUAL "0")
+  IF( ${ARGN} STREQUAL "0")
     SET(_dowarn 0)
-  ELSE( "${ARGN}" STREQUAL "0")
+  ELSE()
     SET(_dowarn 1)
-  ENDIF("${ARGN}" STREQUAL "0")
+  ENDIF()
 
 
   _PCH_GET_TARGET_COMPILE_FLAGS(_target_cflags ${_name} ${_pch_output_to_use} ${_dowarn})

diff --git a/cmakemodules/UtilsMacros.cmake b/cmakemodules/UtilsMacros.cmake
@@ -36,22 +36,22 @@ MACRO(ADD_DIRECTORIES_AS_ISYSTEM INCLUDE_DIRS)
 	IF($ENV{VERBOSE})
 		MESSAGE(STATUS "isystem: INCLUDE_DIRS= ${${INCLUDE_DIRS}}")
 	ENDIF($ENV{VERBOSE})
-	IF(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+	IF(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
 		FOREACH(DIR ${${INCLUDE_DIRS}})
 			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${DIR}")
 		ENDFOREACH(DIR)
-	ENDIF(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+	ENDIF()
 ENDMACRO(ADD_DIRECTORIES_AS_ISYSTEM)
 
 MACRO(ADD_DIRECTORIES_AS_INCLUDE_AND_ISYSTEM INCLUDE_DIRS)
 	IF($ENV{VERBOSE})
 		MESSAGE(STATUS "isystem: INCLUDE_DIRS= ${${INCLUDE_DIRS}}")
 	ENDIF($ENV{VERBOSE})
-	IF(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+	IF(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
 		FOREACH(DIR ${${INCLUDE_DIRS}})
 			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I ${DIR} -isystem ${DIR}")
 		ENDFOREACH(DIR)
-	ENDIF(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+	ENDIF()
 ENDMACRO(ADD_DIRECTORIES_AS_INCLUDE_AND_ISYSTEM)
 
 

diff --git a/cmakemodules/script_SIMD.cmake b/cmakemodules/script_SIMD.cmake
@@ -20,9 +20,9 @@ macro(DEFINE_SSE_VAR  _setname)
 	IF (DO_SSE_AUTODETECT)
 		# Automatic detection:
 		SET(CMAKE_MRPT_HAS_${_setname} 0)
-		IF ("${MRPT_CPU_INFO}" MATCHES ".*${_set}.*")
+		IF (${MRPT_CPU_INFO} MATCHES ".*${_set}.*")
 			SET(CMAKE_MRPT_HAS_${_setname} 1)
-		ENDIF("${MRPT_CPU_INFO}" MATCHES ".*${_set}.*")
+		ENDIF()
 	ELSE (DO_SSE_AUTODETECT)
 		# Manual:
 		SET("DISABLE_${_setname}" OFF CACHE BOOL "Forces compilation WITHOUT ${_setname} extensions")

diff --git a/cmakemodules/script_detect_clang.cmake b/cmakemodules/script_detect_clang.cmake
@@ -1,7 +1,7 @@
 # ----------------------------------------------------------------------------
 # Detect GNU version:
 # ----------------------------------------------------------------------------
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
 	execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version
 		          OUTPUT_VARIABLE CMAKE_MRPT_CLANG_VERSION_FULL
 		          OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -21,5 +21,5 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 	IF($ENV{VERBOSE})
 		MESSAGE(STATUS "clang --version: '${CMAKE_MRPT_CLANG_VERSION_FULL}' -> Major=${CMAKE_MRPT_CLANG_VERSION_MAJOR} Minor=${CMAKE_MRPT_CLANG_VERSION_MINOR}")
 	ENDIF($ENV{VERBOSE})
-endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+endif ()
 
diff --git a/cmakemodules/script_init_cmake.cmake b/cmakemodules/script_init_cmake.cmake
@@ -1,8 +0,0 @@
-if(COMMAND cmake_policy)
-	# We don't want to mix relative and absolute paths in linker lib lists.
-	cmake_policy(SET CMP0003 NEW) 
-
-#	if(POLICY CMP0054)
-#		cmake_policy(SET CMP0054 NEW) # http://www.cmake.org/cmake/help/v3.1/policy/CMP0054.html
-#	endif(POLICY CMP0054)
-endif(COMMAND cmake_policy)

diff --git a/cmakemodules/script_show_final_summary.cmake b/cmakemodules/script_show_final_summary.cmake
@@ -77,7 +77,7 @@ IF("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
    MESSAGE( STATUS "C++ flags (Release):     ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}")
 ELSEIF("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
    MESSAGE( STATUS "C++ flags (Debug):       ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
-ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+ENDIF()
 
 
 MESSAGE(STATUS "")

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -6,12 +6,6 @@ INCLUDE(../cmakemodules/AssureCMakeRootFile.cmake) # Avoid user mistake in CMake
 
 PROJECT(documentation)
 
-# Allow using the LOCATION target property.
-if(POLICY CMP0026)
-	cmake_policy(SET CMP0026 OLD)
-endif(POLICY CMP0026)
-
-
 IF(UNIX)
 	add_subdirectory(man-pages)
 ENDIF(UNIX)

diff --git a/libs/hwdrivers/CMakeLists.txt b/libs/hwdrivers/CMakeLists.txt
@@ -155,12 +155,12 @@ IF(BUILD_mrpt-hwdrivers)
 		ENDIF(MRPT_ENABLE_PRECOMPILED_HDRS AND MSVC)
 
 		# Avoid some annoying warnings:
-		IF (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+		IF (CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
 			set_source_files_properties(${xSens_MT3_FILES} ${xSens_MT4_FILES} PROPERTIES COMPILE_FLAGS "-Wno-variadic-macros")
 			# -D_... = Needed to have CLOCK_REALTIME,... in gcc
 			# -fms-extensions: Unnamed structs in unions
 			set_source_files_properties(${xSens_MT4_FILES} PROPERTIES COMPILE_FLAGS "-D_POSIX_C_SOURCE=199309L -fms-extensions") 
-		ENDIF (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+		ENDIF ()
 
 		ADD_DEFINITIONS(-D_LOG_TO_STDOUT)
 	ENDIF(CMAKE_MRPT_HAS_xSENS_MT3 OR CMAKE_MRPT_HAS_xSENS_MT4)

diff --git a/otherlibs/assimp/code/CMakeLists.txt b/otherlibs/assimp/code/CMakeLists.txt
@@ -5,6 +5,11 @@
 #    source groups and library command)
 #
 cmake_minimum_required( VERSION 2.6 )
+if(POLICY CMP0043)
+	cmake_policy(SET CMP0043 OLD) #  Ignore COMPILE_DEFINITIONS_<Config> properties.
+endif()
+
+
 SET( HEADER_PATH ../include/assimp )
 
 SET( COMPILER_HEADERS

diff --git a/otherlibs/assimp/contrib/zlib/CMakeLists.txt b/otherlibs/assimp/contrib/zlib/CMakeLists.txt
@@ -1,9 +1,16 @@
 cmake_minimum_required(VERSION 2.4.4)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 
+IF(POLICY CMP0048)
+cmake_policy(SET CMP0048 OLD)
+ENDIF()
+
 project(zlib C)
 
 set(VERSION "1.2.8")
+if(POLICY CMP0043)
+	cmake_policy(SET CMP0043 OLD) #  Ignore COMPILE_DEFINITIONS_<Config> properties.
+endif()
 
 option(ASM686 "Enable building i686 assembly implementation for zlib")
 option(AMD64 "Enable building amd64 assembly implementation for zlib")

diff --git a/samples/CMakeLists_template.txt.in b/samples/CMakeLists_template.txt.in
@@ -15,7 +15,10 @@ PROJECT(${PRJ_NAME})
 # These commands are needed by modern versions of CMake:
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 if(COMMAND cmake_policy)
-      cmake_policy(SET CMP0003 NEW)  # Required by CMake 2.7+
+    cmake_policy(SET CMP0003 NEW)  # Required by CMake 2.7+
+	if(POLICY CMP0043)
+		cmake_policy(SET CMP0043 OLD) #  Ignore COMPILE_DEFINITIONS_<Config> properties.
+	endif()
 endif(COMMAND cmake_policy)
 
 # ---------------------------------------------------------------------------
@@ -66,8 +69,8 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_BUILD_TYPE MATCHES "Debug")
 # This part can be removed if you are compiling this program outside of 
 #  the MRPT tree:
 # -------------------------------------------------------------------------
-IF("${CMAKE_PROJECT_NAME}" STREQUAL "MRPT") # Fails if build outside of MRPT project.
+IF(${CMAKE_PROJECT_NAME} STREQUAL "MRPT") # Fails if build outside of MRPT project.
 	DeclareAppDependencies(${sampleName} @CMAKE_EXAMPLE_DEPS@) # Dependencies
-ENDIF("${CMAKE_PROJECT_NAME}" STREQUAL "MRPT")
+ENDIF(${CMAKE_PROJECT_NAME} STREQUAL "MRPT")
 # -------------------------------------------------------------------------
 
diff --git a/samples/FTDI_USB_enumerate_test/CMakeLists.txt b/samples/FTDI_USB_enumerate_test/CMakeLists.txt
@@ -15,7 +15,10 @@ PROJECT(${PRJ_NAME})
 # These commands are needed by modern versions of CMake:
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 if(COMMAND cmake_policy)
-      cmake_policy(SET CMP0003 NEW)  # Required by CMake 2.7+
+    cmake_policy(SET CMP0003 NEW)  # Required by CMake 2.7+
+	if(POLICY CMP0043)
+		cmake_policy(SET CMP0043 OLD) #  Ignore COMPILE_DEFINITIONS_<Config> properties.
+	endif()
 endif(COMMAND cmake_policy)
 
 # ---------------------------------------------------------------------------
@@ -66,8 +69,8 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_BUILD_TYPE MATCHES "Debug")
 # This part can be removed if you are compiling this program outside of 
 #  the MRPT tree:
 # -------------------------------------------------------------------------
-IF("${CMAKE_PROJECT_NAME}" STREQUAL "MRPT") # Fails if build outside of MRPT project.
+IF(${CMAKE_PROJECT_NAME} STREQUAL "MRPT") # Fails if build outside of MRPT project.
 	DeclareAppDependencies(${sampleName} mrpt-hwdrivers;mrpt-gui) # Dependencies
-ENDIF("${CMAKE_PROJECT_NAME}" STREQUAL "MRPT")
+ENDIF(${CMAKE_PROJECT_NAME} STREQUAL "MRPT")
 # -------------------------------------------------------------------------
 
diff --git a/samples/GPS_test/CMakeLists.txt b/samples/GPS_test/CMakeLists.txt
@@ -15,7 +15,10 @@ PROJECT(${PRJ_NAME})
 # These commands are needed by modern versions of CMake:
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 if(COMMAND cmake_policy)
-      cmake_policy(SET CMP0003 NEW)  # Required by CMake 2.7+
+    cmake_policy(SET CMP0003 NEW)  # Required by CMake 2.7+
+	if(POLICY CMP0043)
+		cmake_policy(SET CMP0043 OLD) #  Ignore COMPILE_DEFINITIONS_<Config> properties.
+	endif()
 endif(COMMAND cmake_policy)
 
 # ---------------------------------------------------------------------------
@@ -66,8 +69,8 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_BUILD_TYPE MATCHES "Debug")
 # This part can be removed if you are compiling this program outside of 
 #  the MRPT tree:
 # -------------------------------------------------------------------------
-IF("${CMAKE_PROJECT_NAME}" STREQUAL "MRPT") # Fails if build outside of MRPT project.
+IF(${CMAKE_PROJECT_NAME} STREQUAL "MRPT") # Fails if build outside of MRPT project.
 	DeclareAppDependencies(${sampleName} mrpt-hwdrivers;mrpt-gui) # Dependencies
-ENDIF("${CMAKE_PROJECT_NAME}" STREQUAL "MRPT")
+ENDIF(${CMAKE_PROJECT_NAME} STREQUAL "MRPT")
 # -------------------------------------------------------------------------