updated cmake min version to 2.8.3, use cmake_parse_arguments instead…

… of custom macro
locusrobotics · Oct 3, 2012 · c398a2a · c398a2a
1 parent bfd334d
commit c398a2a
Show file tree

Hide file tree

Showing 23 changed files with 38 additions and 26 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 
 set(catkin_EXTRAS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 

diff --git a/cmake/all.cmake b/cmake/all.cmake
@@ -61,6 +61,9 @@ if(NOT PROJECT_NAME)
   project(catkin_internal)
 endif()
 
+# include CMake functions
+include(CMakeParseArguments)
+
 # functions/macros: list_append_unique, safe_execute_process
 # python-integration: catkin_python_setup.cmake, interrogate_setup_dot_py.py, templates/__init__.py.in, templates/script.py.in, templates/python_distutils_install.bat.in, templates/python_distutils_install.sh.in, templates/safe_execute_install.cmake.in
 foreach(filename

diff --git a/cmake/catkin_add_env_hooks.cmake b/cmake/catkin_add_env_hooks.cmake
@@ -32,7 +32,7 @@
 # @public
 #
 function(catkin_add_env_hooks file_prefix)
-  parse_arguments(ARG "DIRECTORY;SHELLS" "SKIP_INSTALL" ${ARGN})
+  cmake_parse_arguments(ARG "SKIP_INSTALL" "DIRECTORY" "SHELLS" ${ARGN})
 
   # create directory if necessary
   if(NOT IS_DIRECTORY ${CATKIN_BUILD_PREFIX}/etc/catkin/profile.d)

diff --git a/cmake/catkin_package_xml.cmake b/cmake/catkin_package_xml.cmake
@@ -28,9 +28,9 @@ macro(catkin_package_xml)
     message(FATAL_ERROR "catkin_package_xml() PROJECT_NAME is not set. You must call project() before you can call catkin_package_xml().")
   endif()
 
-  parse_arguments(_PACKAGE_XML "DIRECTORY" "" ${ARGN})
-  if(_PACKAGE_XML_DEFAULT_ARGS)
-    message(FATAL_ERROR "catkin_package_xml() called with unused arguments: ${_PACKAGE_XML_DEFAULT_ARGS}")
+  cmake_parse_arguments(_PACKAGE_XML "" "DIRECTORY" "" ${ARGN})
+  if(_PACKAGE_XML_UNPARSED_ARGUMENTS)
+    message(FATAL_ERROR "catkin_package_xml() called with unused arguments: ${_PACKAGE_XML_UNPARSED_ARGUMENTS}")
   endif()
   # set default directory
   if(NOT _PACKAGE_XML_DIRECTORY)

diff --git a/cmake/find_program_required.cmake b/cmake/find_program_required.cmake
@@ -1,5 +1,5 @@
 function(find_program_required ARG_VAR ARG_PROGRAM_NAME)
-  parse_arguments(ARG "PATHS" "NO_DEFAULT_PATH;NO_CMAKE_FIND_ROOT_PATH" ${ARGN})
+  cmake_parse_arguments(ARG "NO_DEFAULT_PATH;NO_CMAKE_FIND_ROOT_PATH" "" "PATHS" ${ARGN})
   find_program(${ARG_VAR} ${ARG_PROGRAM_NAME} PATHS ${ARG_PATHS} ${ARG_NO_DEFAULT_PATH} ${ARG_NO_CMAKE_FIND_ROOT_PATH})
   if(NOT ${ARG_VAR})
     message(FATAL_ERROR "${ARG_PROGRAM_NAME} not found")

diff --git a/cmake/parse_arguments.cmake b/cmake/parse_arguments.cmake
@@ -2,7 +2,16 @@
 # parse_arguments() taken from
 # http://www.itk.org/Wiki/CMakeMacroParseArguments
 #
+# @deprecated use CMakeParseArguments instead
+#
 macro(parse_arguments prefix arg_names option_names)
+  message(WARNING "parse_arguments(prefix args options ${ARGN}) is deprecated. Use the corresponding CMake function instead:")
+  message("  call 'include(CMakeParseArguments)' to include the CMake function")
+  message("  Update the signature:")
+  message("  instead of 'parse_arguments(prefix option_names arg_names ${ARGN})'")
+  message("  it is 'cmake_parse_arguments(prefix option_names single_arg_names multi_arg_names ${ARGN}))")
+  message("  and the variable containing not matched arguments must be changed form 'prefix_DEFAULT_ARGS' to 'prefix_UNPARSED_ARGUMENTS'")
+
   set(DEFAULT_ARGS)
   foreach(arg_name ${arg_names})
     set(${prefix}_${arg_name})

diff --git a/cmake/test/gtest.cmake b/cmake/test/gtest.cmake
@@ -27,15 +27,15 @@ function(catkin_add_gtest target)
   endif()
 
   # XXX look for optional TIMEOUT argument, #2645
-  parse_arguments(_gtest "TIMEOUT;WORKING_DIRECTORY" "" ${ARGN})
+  cmake_parse_arguments(_gtest "" "TIMEOUT;WORKING_DIRECTORY" "" ${ARGN})
   if(_gtest_TIMEOUT)
     message(WARNING "TIMEOUT argument to catkin_add_gtest() is ignored")
   endif()
 
   # create the executable, with basic + gtest build flags
   include_directories(${GTEST_INCLUDE_DIRS})
   link_directories(${GTEST_LIBRARY_DIRS})
-  add_executable(${target} EXCLUDE_FROM_ALL ${_gtest_DEFAULT_ARGS})
+  add_executable(${target} EXCLUDE_FROM_ALL ${_gtest_UNPARSED_ARGUMENTS})
   assert(GTEST_LIBRARIES)
   target_link_libraries(${target} ${GTEST_LIBRARIES} ${THREADS_LIBRARY})
 

diff --git a/cmake/test/nosetests.cmake b/cmake/test/nosetests.cmake
@@ -29,7 +29,7 @@ function(catkin_add_nosetests path)
     return()
   endif()
 
-  parse_arguments(_nose "DEPENDENCIES;TIMEOUT;WORKING_DIRECTORY" "" ${ARGN})
+  cmake_parse_arguments(_nose "" "TIMEOUT;WORKING_DIRECTORY" "DEPENDENCIES" ${ARGN})
   if(NOT _nose_TIMEOUT)
     set(_nose_TIMEOUT 60)
   endif()

diff --git a/cmake/test/tests.cmake b/cmake/test/tests.cmake
@@ -34,9 +34,9 @@ endif()
 # catkin_add_*test() functions.
 #
 function(catkin_run_tests_target type name xunit_filename)
-  parse_arguments(_testing "COMMAND;DEPENDENCIES;WORKING_DIRECTORY" "" ${ARGN})
-  if(_testing_DEFAULT_ARGS)
-    message(FATAL_ERROR "catkin_run_tests_target() called with unused arguments: ${_testing_DEFAULT_ARGS}")
+  cmake_parse_arguments(_testing "" "WORKING_DIRECTORY" "COMMAND;DEPENDENCIES" ${ARGN})
+  if(_testing_UNPARSED_ARGUMENTS)
+    message(FATAL_ERROR "catkin_run_tests_target() called with unused arguments: ${_testing_UNPARSED_ARGUMENTS}")
   endif()
 
   # create meta target to trigger all tests of a project

diff --git a/cmake/toplevel.cmake b/cmake/toplevel.cmake
@@ -1,7 +1,7 @@
 # toplevel CMakeLists.txt for a catkin workspace
 # catkin/cmake/toplevel.cmake
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 
 # optionally provide a cmake file in the workspace to override arbitrary stuff
 include(workspace.cmake OPTIONAL)

diff --git a/doc/user_guide/catkin_migration.rst b/doc/user_guide/catkin_migration.rst
@@ -34,7 +34,7 @@ file::
 
 The contents of the /stick/stick/CMakeLists.txt file should look like this::
 
-  cmake_minimum_required(VERSION 2.8)
+  cmake_minimum_required(VERSION 2.8.3)
   project(stick)
   find_package(catkin REQUIRED)
   catkin_package()

diff --git a/doc/user_guide/standards.rst b/doc/user_guide/standards.rst
@@ -9,7 +9,7 @@ frequent errors, follow the standards below.
 The following line should always appear like this in this order
 without other commands in between::
 
-  cmake_minimum_required(VERSION 2.8)
+  cmake_minimum_required(VERSION 2.8.3)
   project(myproject)
   find_package(catkin REQUIRED <COMPONENTS ...>)
   catkin_project(${PROJECT_NAME} <...>)

diff --git a/doc/user_guide/supposed.rst b/doc/user_guide/supposed.rst
@@ -51,7 +51,7 @@ CMakeLists.txt
 
 The basic case::
 
-   cmake_minimum_required(VERSION 2.8)
+   cmake_minimum_required(VERSION 2.8.3)
    project(pkgname)
 
    find_package(catkin REQUIRED [COMPONENTS otherpkg ...])

diff --git a/test/mock_resources/src-fail/badly_specified_changelog/CMakeLists.txt b/test/mock_resources/src-fail/badly_specified_changelog/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 
 project(badly_specified_changelog)
 find_package(catkin)

diff --git a/test/mock_resources/src-fail/noproject/CMakeLists.txt b/test/mock_resources/src-fail/noproject/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 # commented to cause failure
 # project(noproject)
 find_package(catkin)

diff --git a/test/mock_resources/src/catkin_test/CMakeLists.txt b/test/mock_resources/src/catkin_test/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 project(catkin_test)
 find_package(catkin REQUIRED)
 

diff --git a/test/mock_resources/src/catkin_test/a/CMakeLists.txt b/test/mock_resources/src/catkin_test/a/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 project(a)
 find_package(catkin REQUIRED COMPONENTS genmsg std_msgs)
 

diff --git a/test/mock_resources/src/catkin_test/b/CMakeLists.txt b/test/mock_resources/src/catkin_test/b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 project(b)
 find_package(catkin REQUIRED)
 catkin_package(

diff --git a/test/mock_resources/src/catkin_test/c/CMakeLists.txt b/test/mock_resources/src/catkin_test/c/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 project(c)
 find_package(catkin REQUIRED)
 

diff --git a/test/mock_resources/src/catkin_test/d/CMakeLists.txt b/test/mock_resources/src/catkin_test/d/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 project(d)
 find_package(catkin REQUIRED)
 

diff --git a/test/mock_resources/src/catkin_test/quux_msgs/CMakeLists.txt b/test/mock_resources/src/catkin_test/quux_msgs/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 project(quux_msgs)
 find_package(catkin REQUIRED)
 

diff --git a/test/mock_resources/src/catkin_test/quux_user/CMakeLists.txt b/test/mock_resources/src/catkin_test/quux_user/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 project(quux_user)
 find_package(catkin REQUIRED)
 

diff --git a/test/mock_resources/src/nolangs/CMakeLists.txt b/test/mock_resources/src/nolangs/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 
 project(nolangs)
 find_package(catkin REQUIRED)