Squashed 'src/cmake/modules/' changes from c77e4360..2b8470d2

2b8470d2 enh: Add BASIS_UNINSTALLER option which is OFF by default dd0490bc enh: Add basis_project_args helper for top-level project() 980ba9bc fix: get_filename_component support for PROGRAM_ARGS and BASE_DIR [BASIS] 6ce89dfb fix: Deprecated CMake policy regarding PROJECT_VERSION setting [Basis] 78fd7ef5 fix: Add INSTALL_<LANG>_SITE_DIR to script module paths [Basis] 69ff6606 fix: Language C++11 requires -std=c++11 flag, not just -std=c++0x [Basis] git-subtree-dir: src/cmake/modules git-subtree-split: 2b8470d29d42aee321a22dfd9ae56653d508a27a

Author: aschuh-hf

BasisSettings.cmake

@@ -64,6 +64,10 @@ if (POLICY CMP0042)
  cmake_policy (SET CMP0042 NEW)
 endif ()
 
+if (POLICY CMP0074)
+ cmake_policy (SET CMP0074 NEW)
+endif ()
+
 # ============================================================================
 # required modules
 # ============================================================================
@@ -833,6 +837,10 @@ mark_as_advanced (BASIS_DEBUG)
 option (BASIS_BUILD_ONLY "Request configuration of software build only, skipping steps related to packaging and installation." OFF)
 mark_as_advanced (BASIS_BUILD_ONLY)
 
+## @brief Request generation of package uninstaller script upon installation.
+option (BASIS_UNINSTALLER "Request generation of default package uninstall script upon installation." OFF)
+mark_as_advanced (BASIS_UNINSTALLER)
+
 # ============================================================================
 # build configuration
 # ============================================================================

CommonTools.cmake

@@ -1100,35 +1100,38 @@ endmacro ()
 #
 # @sa http://www.cmake.org/cmake/help/cmake-2-8-docs.html#command:get_filename_component
 # @sa basis_get_filename_component()
-function (get_filename_component)
- if (ARGC LESS 3)
- message (FATAL_ERROR "[basis_]get_filename_component(): At least three arguments required!")
- elseif (ARGC GREATER 4)
- message (FATAL_ERROR "[basis_]get_filename_component(): Too many arguments!")
- endif ()
- list (GET ARGN 0 VAR)
- list (GET ARGN 1 STR)
- list (GET ARGN 2 CMD)
- if (CMD MATCHES "^EXT")
- _get_filename_component (${VAR} "${STR}" ${CMD})
+function (get_filename_component VAR STR CMP)
+ list (FIND ARGN "CACHE" IDX)
+ if (IDX EQUAL -1)
+ set (OPT_CACHE 0)
+ else ()
+ list (REMOVE_ITEM ARGN "CACHE")
+ set (OPT_CACHE 1)
+ endif ()
+ if (CMP MATCHES "^EXT")
+ _get_filename_component (${VAR} "${STR}" ${CMP} ${ARGN})
  string (REGEX MATCHALL "\\.[^.]*" PARTS "${${VAR}}")
  list (LENGTH PARTS LEN)
  if (LEN GREATER 1)
  math (EXPR LEN "${LEN} - 1")
  list (GET PARTS ${LEN} ${VAR})
  endif ()
- elseif (CMD MATCHES "NAME_WE")
- _get_filename_component (${VAR} "${STR}" NAME)
+ elseif (CMP MATCHES "NAME_WE")
+ _get_filename_component (${VAR} "${STR}" NAME ${ARGN})
  string (REGEX REPLACE "\\.[^.]*$" "" ${VAR} ${${VAR}})
  else ()
- _get_filename_component (${VAR} "${STR}" ${CMD})
- endif ()
- if (ARGC EQUAL 4)
- if (NOT "^${ARGV3}$" STREQUAL "^CACHE$")
- message (FATAL_ERROR "[basis_]get_filename_component(): Invalid fourth argument: ${ARGV3}!")
- else ()
- set (${VAR} "${${VAR}}" CACHE STRING "")
+ _get_filename_component (${VAR} "${STR}" ${CMP} ${ARGN})
+ if (CMP MATCHES "PROGRAM")
+ list (FIND ARGN "PROGRAM_ARGS" IDX)
+ if (NOT IDX EQUAL -1)
+ math (EXPR IDX "${IDX} + 1")
+ list (GET ARGN ${IDX} ARG_VAR)
+ set (${ARG_VAR} "${${ARG_VAR}}" PARENT_SCOPE)
+ endif ()
  endif ()
+ endif ()
+ if (OPT_CACHE)
+ set (${VAR} "${${VAR}}" CACHE STRING "")
  else ()
  set (${VAR} "${${VAR}}" PARENT_SCOPE)
  endif ()

ProjectTools.cmake

@@ -1795,6 +1795,69 @@ function (basis_find_logo OUTPUT_VARIABLE SPECIFIED_LOGO DEFAULT_NAME)
  endif ()
 endfunction()
 
+
+# ----------------------------------------------------------------------------
+## @brief Load project command arguments from BasisProject.cmake file.
+function (basis_project_args VAR)
+
+ # hide it here to avoid that it shows up in the GUI on error
+ set (CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE INTERNAL "" FORCE)
+
+ # project meta-data
+ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/BasisProject.cmake")
+ set (BASIS_basis_project_CALLED FALSE)
+ set (PROJECT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+ include ("${CMAKE_CURRENT_SOURCE_DIR}/BasisProject.cmake")
+ if (NOT BASIS_basis_project_CALLED)
+ message (FATAL_ERROR "Missing basis_project() command in BasisProject.cmake!")
+ endif ()
+ else ()
+ message (FATAL_ERROR "Missing BasisProject.cmake file!")
+ endif ()
+
+ # project command arguments
+ set (LANGUAGES)
+ foreach (lang IN LISTS PROJECT_LANGUAGES)
+ if (lang MATCHES "^(C|CXX)$")
+ list (APPEND LANGUAGES ${lang})
+ elseif (lang MATCHES "^CXX-?[0-9][0-9x]+$")
+ list (APPEND LANGUAGES CXX)
+ endif ()
+ endforeach ()
+
+ if (POLICY CMP0048)
+ cmake_policy (SET CMP0048 NEW)
+ set (_args "${PROJECT_NAME}" VERSION "${PROJECT_VERSION}" LANGUAGES ${LANGUAGES})
+ if (CMAKE_VERSION VERSION_LESS 3.9)
+ set (PROJECT_DESCRIPTION "${PROJECT_DESCRIPTION}" PARENT_SCOPE)
+ elseif (PROJECT_DESCRIPTION)
+ list(APPEND _args DESCRIPTION "${PROJECT_DESCRIPTION}")
+ endif ()
+ if (CMAKE_VERSION VERSION_LESS 3.12)
+ set (PROJECT_HOMEPAGE_URL "${PROJECT_PACKAGE_WEBSITE}" PARENT_SCOPE)
+ elseif (PROJECT_PACKAGE_WEBSITE)
+ list(APPEND _args HOMEPAGE_URL "${PROJECT_PACKAGE_WEBSITE}")
+ endif ()
+ else ()
+ set (_args "${PROJECT_NAME}" ${LANGUAGES})
+ basis_version_numbers (
+ "${PROJECT_VERSION}"
+ PROJECT_VERSION_MAJOR
+ PROJECT_VERSION_MINOR
+ PROJECT_VERSION_PATCH
+ )
+ set (PROJECT_VERSION "${PROJECT_VERSION}" PARENT_SCOPE)
+ set (PROJECT_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}" PARENT_SCOPE)
+ set (PROJECT_VERSION_MINOR "${PROJECT_VERSION_MINOR}" PARENT_SCOPE)
+ set (PROJECT_VERSION_PATCH "${PROJECT_VERSION_PATCH}" PARENT_SCOPE)
+ set (PROJECT_DESCRIPTION "${PROJECT_DESCRIPTION}" PARENT_SCOPE)
+ set (PROJECT_HOMEPAGE_URL "${PROJECT_PACKAGE_WEBSITE}" PARENT_SCOPE)
+ endif ()
+
+ set ("${VAR}" "${_args}" PARENT_SCOPE)
+
+endfunction()
+
 # ----------------------------------------------------------------------------
 ## @brief Initialize project, calls CMake's project() command.
 #
@@ -1830,11 +1893,6 @@ macro (basis_project_initialize)
  cmake_policy (SET CMP0017 NEW)
  endif ()
 
- if (POLICY CMP0048)
- # PROJECT_VERSION et al. variables are set by basis_project instead
- cmake_policy (SET CMP0048 OLD)
- endif ()
-
  # --------------------------------------------------------------------------
  # reset
 
@@ -1863,21 +1921,16 @@ macro (basis_project_initialize)
  endif ()
 
  # --------------------------------------------------------------------------
- # project()
- set (LANGUAGES)
- foreach (lang IN LISTS PROJECT_LANGUAGES)
- if (lang MATCHES "^(C|CXX)$")
- list (APPEND LANGUAGES ${lang})
- elseif (lang MATCHES "^CXX-?[0-9][0-9x]+$")
- list (APPEND LANGUAGES CXX)
- endif ()
- endforeach ()
-
- project ("${PROJECT_NAME}" ${LANGUAGES})
+ # project command
+ basis_project_args (_args)
+ project (${_args})
+ unset (_args)
 
  # work-around for issue with CMAKE_PROJECT_NAME always being set to 'Project'
- if ("${PROJECT_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
- set_property (CACHE CMAKE_PROJECT_NAME PROPERTY VALUE "${PROJECT_NAME}")
+ if (CMAKE_PROJECT_NAME STREQUAL "Project" AND "${PROJECT_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
+ basis_update_value (CMAKE_PROJECT_NAME "${PROJECT_NAME}")
+ basis_update_value (CMAKE_PROJECT_VERSION "${PROJECT_VERSION}")
+ basis_update_value (CMAKE_PROJECT_DESCRIPTION "${PROJECT_DESCRIPTION}")
  endif ()
 
  # C++ standard
@@ -1888,9 +1941,6 @@ macro (basis_project_initialize)
  if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
  include(CheckCXXCompilerFlag)
  CHECK_CXX_COMPILER_FLAG("-std=c++${CXX_VERSION}" COMPILER_SUPPORTS_CXX${CXX_VERSION})
- if (CXX_VERSION STREQUAL "11" AND NOT COMPILER_SUPPORTS_CXX${CXX_VERSION})
- CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX${CXX_VERSION})
- endif ()
  if (COMPILER_SUPPORTS_CXX${CXX_VERSION})
  if (NOT CMAKE_CXX_FLAGS MATCHES "-std=c\\+\\+${CXX_VERSION}")
  if (CMAKE_CXX_FLAGS)
@@ -1899,7 +1949,7 @@ macro (basis_project_initialize)
  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-std=c++${CXX_VERSION}")
  endif ()
  else ()
- message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++${CXX_VERSION} support. Please use a different C++ compiler.")
+ message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no full C++${CXX_VERSION} support. Please use a different C++ compiler.")
  endif ()
  endif ()
  else ()
@@ -1927,14 +1977,6 @@ macro (basis_project_initialize)
  set (PROJECT_REVISION 0)
  endif ()
 
- # extract version numbers from version string
- basis_version_numbers (
- "${PROJECT_VERSION}"
- PROJECT_VERSION_MAJOR
- PROJECT_VERSION_MINOR
- PROJECT_VERSION_PATCH
- )
-
  if (NOT DEFINED PROJECT_SOVERSION OR PROJECT_SOVERSION STREQUAL "")
  set (PROJECT_SOVERSION "${PROJECT_VERSION_MAJOR}")
  endif ()
@@ -2675,7 +2717,9 @@ macro (basis_project_end)
  # Attention: add_uninstall must be called last in a separate file via an
  # add_subdirectory call. This ensures that the code is executed
  # at the end of the root cmake_install.cmake file.
- add_subdirectory ("${BASIS_MODULE_PATH}/uninstall" "${PROJECT_BINARY_DIR}/uninstall")
+ if (BASIS_UNINSTALLER)
+ add_subdirectory ("${BASIS_MODULE_PATH}/uninstall" "${PROJECT_BINARY_DIR}/uninstall")
+ endif ()
  endif ()
 
  endif ()

TargetTools.cmake

@@ -2879,6 +2879,13 @@ function (basis_build_script TARGET_UID)
  if (BINARY_${LANGUAGE}_LIBRARY_DIR)
  list (INSERT BUILD_LINK_DEPENDS 0 "${BINARY_${LANGUAGE}_LIBRARY_DIR}")
  endif ()
+ if (INSTALL_${LANGUAGE}_SITE_DIR AND NOT BASIS_INSTALL_SITE_PACKAGES)
+ if (IS_ABSOLUTE "${INSTALL_${LANGUAGE}_SITE_DIR}")
+ list (INSERT INSTALL_LINK_DEPENDS 0 "${INSTALL_${LANGUAGE}_SITE_DIR}")
+ else ()
+ list (INSERT INSTALL_LINK_DEPENDS 0 "relative ${CMAKE_INSTALL_PREFIX}/${INSTALL_${LANGUAGE}_SITE_DIR}")
+ endif ()
+ endif ()
  if (INSTALL_${LANGUAGE}_LIBRARY_DIR)
  list (INSERT INSTALL_LINK_DEPENDS 0 "relative ${CMAKE_INSTALL_PREFIX}/${INSTALL_${LANGUAGE}_LIBRARY_DIR}")
  endif ()