sync with upstream

5 files changed, 133 insertions, 54 deletions

diff --git a/cmake/scripts/common/AddonHelpers.cmake b/cmake/scripts/common/AddonHelpers.cmake
index c11923e..5470940 100644
--- a/cmake/scripts/common/AddonHelpers.cmake
+++ b/cmake/scripts/common/AddonHelpers.cmake
@@ -6,15 +6,20 @@
 # Sadly we cannot extend the 'package' target, as it is a builtin target, see 
 # http://public.kitware.com/Bug/view.php?id=8438
 # Thus, we have to add an 'addon-package' target.
-add_custom_target(addon-package
-                  COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target package)
+get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+if(_isMultiConfig)
+  add_custom_target(addon-package DEPENDS PACKAGE)
+else()
+  add_custom_target(addon-package
+                    COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target package)
+endif()
 
 macro(add_cpack_workaround target version ext)
   if(NOT PACKAGE_DIR)
     set(PACKAGE_DIR "${CMAKE_INSTALL_PREFIX}/zips")
   endif()
 
-  add_custom_command(TARGET addon-package PRE_BUILD
+  add_custom_command(TARGET addon-package POST_BUILD
                      COMMAND ${CMAKE_COMMAND} -E make_directory ${PACKAGE_DIR}
                      COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_PACKAGE_DIRECTORY}/addon-${target}-${version}.${ext} ${PACKAGE_DIR}/${target}-${version}.${ext})
 endmacro()
@@ -194,7 +199,7 @@ macro (build_addon target prefix libs)
     endif()
 
     string(CONFIGURE "${addon_file}" addon_file_conf @ONLY)
-    file(GENERATE OUTPUT ${PROJECT_SOURCE_DIR}/${target}/addon.xml CONTENT "${addon_file_conf}")
+    file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${target}/addon.xml CONTENT "${addon_file_conf}")
     if(${APP_NAME_UC}_BUILD_DIR)
       file(GENERATE OUTPUT ${${APP_NAME_UC}_BUILD_DIR}/addons/${target}/addon.xml CONTENT "${addon_file_conf}")
     endif()
@@ -207,7 +212,7 @@ macro (build_addon target prefix libs)
 
     file(READ ${PROJECT_SOURCE_DIR}/${target}/resources/settings.xml.in settings_file)
     string(CONFIGURE "${settings_file}" settings_file_conf @ONLY)
-    file(GENERATE OUTPUT ${PROJECT_SOURCE_DIR}/${target}/resources/settings.xml CONTENT "${settings_file_conf}")
+    file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${target}/resources/settings.xml CONTENT "${settings_file_conf}")
     if(${APP_NAME_UC}_BUILD_DIR)
       file(GENERATE OUTPUT ${${APP_NAME_UC}_BUILD_DIR}/addons/${target}/resources/settings.xml CONTENT "${settings_file_conf}")
     endif()
@@ -230,7 +235,7 @@ macro (build_addon target prefix libs)
     set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
     list(APPEND CPACK_COMPONENTS_ALL ${target}-${${prefix}_VERSION})
     # Pack files together to create an archive
-    install(DIRECTORY ${target} DESTINATION ./
+    install(DIRECTORY ${target} ${CMAKE_CURRENT_BINARY_DIR}/${target} DESTINATION ./
                                 COMPONENT ${target}-${${prefix}_VERSION}
                                 REGEX ".+\\.xml\\.in(clude)?$" EXCLUDE)
     if(WIN32)
@@ -247,21 +252,15 @@ macro (build_addon target prefix libs)
         endif()
       endif()
 
-      # in case of a VC++ project the installation location contains a $(Configuration) VS variable
-      # we replace it with ${CMAKE_BUILD_TYPE} (which doesn't cover the case when the build configuration
-      # is changed within Visual Studio)
-      string(REPLACE "$(Configuration)" "${CMAKE_BUILD_TYPE}" LIBRARY_LOCATION "${LIBRARY_LOCATION}")
-
       if(${prefix}_SOURCES)
         # install the generated DLL file
         install(PROGRAMS ${LIBRARY_LOCATION} DESTINATION ${target}
                 COMPONENT ${target}-${${prefix}_VERSION})
 
-        if(CMAKE_BUILD_TYPE MATCHES Debug)
-          # for debug builds also install the PDB file
-          install(FILES $<TARGET_PDB_FILE:${target}> DESTINATION ${target}
-                  COMPONENT ${target}-${${prefix}_VERSION})
-        endif()
+        # for debug builds also install the PDB file
+        install(FILES $<TARGET_PDB_FILE:${target}> DESTINATION ${target}
+                CONFIGURATIONS Debug RelWithDebInfo
+                COMPONENT ${target}-${${prefix}_VERSION})
       endif()
       if(${prefix}_CUSTOM_BINARY)
         install(FILES ${LIBRARY_LOCATION} DESTINATION ${target} RENAME ${LIBRARY_FILENAME})
@@ -325,7 +324,7 @@ macro (build_addon target prefix libs)
     if (${prefix}_CUSTOM_BINARY)
       install(FILES ${LIBRARY_LOCATION} DESTINATION ${CMAKE_INSTALL_LIBDIR}/addons/${target} RENAME ${LIBRARY_FILENAME})
     endif()
-    install(DIRECTORY ${target} DESTINATION ${CMAKE_INSTALL_DATADIR}/addons
+    install(DIRECTORY ${target} ${CMAKE_CURRENT_BINARY_DIR}/${target} DESTINATION ${CMAKE_INSTALL_DATADIR}/addons
                                 REGEX ".+\\.xml\\.in(clude)?$" EXCLUDE)
     if(${prefix}_CUSTOM_DATA)
       install(DIRECTORY ${${prefix}_CUSTOM_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/addons/${target}/resources)
diff --git a/cmake/scripts/common/ArchSetup.cmake b/cmake/scripts/common/ArchSetup.cmake
index 3b81533..c97929e 100644
--- a/cmake/scripts/common/ArchSetup.cmake
+++ b/cmake/scripts/common/ArchSetup.cmake
@@ -153,6 +153,10 @@ if(NOT DEFINED NEON OR NEON)
   endif()
 endif()
 
+if(PLATFORM_DEFINES)
+  add_options(ALL_LANGUAGES ALL_BUILDS ${PLATFORM_DEFINES})
+endif()
+
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
   add_options (ALL_LANGUAGES DEBUG "-g" "-D_DEBUG" "-Wall")
 endif()
diff --git a/cmake/scripts/common/HandleDepends.cmake b/cmake/scripts/common/HandleDepends.cmake
index 49e5ac8..fb110d6 100644
--- a/cmake/scripts/common/HandleDepends.cmake
+++ b/cmake/scripts/common/HandleDepends.cmake
@@ -54,9 +54,6 @@ function(add_addon_depends addon searchpath)
         if(EXISTS ${dir}/flags.txt)
           set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${dir}/flags.txt)
           file(STRINGS ${dir}/flags.txt extraflags)
-
-          # replace some custom placeholders
-          string(REPLACE "@MINGW_TOOLCHAIN_FILE@" "${OUTPUT_DIR}/Toolchain_mingw32.cmake" extraflags "${extraflags}")
           string(REPLACE " " ";" extraflags ${extraflags})
 
           message(STATUS "${id} extraflags: ${extraflags}")
diff --git a/cmake/scripts/common/Macros.cmake b/cmake/scripts/common/Macros.cmake
index d508f87..c21069d 100644
--- a/cmake/scripts/common/Macros.cmake
+++ b/cmake/scripts/common/Macros.cmake
@@ -338,15 +338,54 @@ macro(export_dep)
   mark_as_advanced(${depup}_LIBRARIES)
 endmacro()
 
-# add a required dependency of main application
+# split dependency specification to name and version
 # Arguments:
-#   dep_list name of find rule for dependency, used uppercased for variable prefix
-#            also accepts a list of multiple dependencies
+#   depspec dependency specification that can optionally include a required
+#           package version
+#           syntax: [package name], [package name]>=[version] (minimum version),
+#                   or [package name]=[version] (exact version)
+#   name_outvar variable that should receive the package name
+#   version_outvar variable that should receive the package version part (>=[version])
 # On return:
-#   dependency added to ${SYSTEM_INCLUDES}, ${DEPLIBS} and ${DEP_DEFINES}
+#   ${name_outvar} and ${version_outvar} in caller scope are set to respective values.
+#   ${version_outvar} may be unset if there is no specific version requested.
+function(split_dependency_specification depspec name_outvar version_outvar)
+  if(${depspec} MATCHES "^([^>]*)(>?=[0-9.]+)$")
+    set(${name_outvar} ${CMAKE_MATCH_1} PARENT_SCOPE)
+    set(${version_outvar} ${CMAKE_MATCH_2} PARENT_SCOPE)
+  else()
+    set(${name_outvar} ${depspec} PARENT_SCOPE)
+    unset(${version_outvar} PARENT_SCOPE)
+  endif()
+endfunction()
+
+# helper macro to split version info from req and call find_package
+macro(find_package_with_ver package)
+  set(_find_arguments "${ARGN}")
+  if("${ARGV1}" MATCHES "^(>)?=([0-9.]+)$")
+    # We have a version spec, parse it
+    list(REMOVE_AT _find_arguments 0)
+    # ">" not present? -> exact match
+    if(NOT CMAKE_MATCH_1)
+      list(INSERT _find_arguments 0 "EXACT")
+    endif()
+    find_package(${package} ${CMAKE_MATCH_2} ${_find_arguments})
+  else()
+    find_package(${package} ${_find_arguments})
+  endif()
+  unset(_find_arguments)
+endmacro()
+
+# add required dependencies of main application
+# Arguments:
+#   dep_list One or many dependency specifications (see split_dependency_specification)
+#            for syntax). The dependency name is used uppercased as variable prefix.
+# On return:
+#   dependencies added to ${SYSTEM_INCLUDES}, ${DEPLIBS} and ${DEP_DEFINES}
 function(core_require_dep)
-  foreach(dep ${ARGN})
-    find_package(${dep} REQUIRED)
+  foreach(depspec ${ARGN})
+    split_dependency_specification(${depspec} dep version)
+    find_package_with_ver(${dep} ${version} REQUIRED)
     string(TOUPPER ${dep} depup)
     list(APPEND SYSTEM_INCLUDES ${${depup}_INCLUDE_DIRS})
     list(APPEND DEPLIBS ${${depup}_LIBRARIES})
@@ -355,15 +394,16 @@ function(core_require_dep)
   endforeach()
 endfunction()
 
-# add a required dyloaded dependency of main application
+# add required dyloaded dependencies of main application
 # Arguments:
-#   dep_list name of find rule for dependency, used uppercased for variable prefix
-#            also accepts a list of multiple dependencies
+#   dep_list One or many dependency specifications (see split_dependency_specification)
+#            for syntax). The dependency name is used uppercased as variable prefix.
 # On return:
 #   dependency added to ${SYSTEM_INCLUDES}, ${dep}_SONAME is set up
 function(core_require_dyload_dep)
-  foreach(dep ${ARGN})
-    find_package(${dep} REQUIRED)
+  foreach(depspec ${ARGN})
+    split_dependency_specification(${depspec} dep version)
+    find_package_with_ver(${dep} ${version} REQUIRED)
     string(TOUPPER ${dep} depup)
     list(APPEND SYSTEM_INCLUDES ${${depup}_INCLUDE_DIRS})
     list(APPEND DEP_DEFINES ${${depup}_DEFINITIONS})
@@ -385,20 +425,21 @@ macro(setup_enable_switch)
   set(${enable_switch} "AUTO" CACHE STRING "Enable ${depup} support?")
 endmacro()
 
-# add an optional dependency of main application
+# add optional dependencies of main application
 # Arguments:
-#   dep_list name of find rule for dependency, used uppercased for variable prefix
-#            also accepts a list of multiple dependencies
+#   dep_list One or many dependency specifications (see split_dependency_specification)
+#            for syntax). The dependency name is used uppercased as variable prefix.
 # On return:
 #   dependency optionally added to ${SYSTEM_INCLUDES}, ${DEPLIBS} and ${DEP_DEFINES}
 function(core_optional_dep)
-  foreach(dep ${ARGN})
+  foreach(depspec ${ARGN})
     set(_required False)
+    split_dependency_specification(${depspec} dep version)
     setup_enable_switch()
     if(${enable_switch} STREQUAL AUTO)
-      find_package(${dep})
+      find_package_with_ver(${dep} ${version})
     elseif(${${enable_switch}})
-      find_package(${dep} REQUIRED)
+      find_package_with_ver(${dep} ${version} REQUIRED)
       set(_required True)
     endif()
 
@@ -417,20 +458,21 @@ function(core_optional_dep)
   set(final_message ${final_message} PARENT_SCOPE)
 endfunction()
 
-# add an optional dyloaded dependency of main application
+# add optional dyloaded dependencies of main application
 # Arguments:
-#   dep_list name of find rule for dependency, used uppercased for variable prefix
-#            also accepts a list of multiple dependencies
+#   dep_list One or many dependency specifications (see split_dependency_specification)
+#            for syntax). The dependency name is used uppercased as variable prefix.
 # On return:
 #   dependency optionally added to ${SYSTEM_INCLUDES}, ${DEP_DEFINES}, ${dep}_SONAME is set up
 function(core_optional_dyload_dep)
-  foreach(dep ${ARGN})
+  foreach(depspec ${ARGN})
     set(_required False)
-    setup_enable_switch()
+    split_dependency_specification(${depspec} dep version)
+    setup_enable_switch()    
     if(${enable_switch} STREQUAL AUTO)
-      find_package(${dep})
+      find_package_with_ver(${dep} ${version})
     elseif(${${enable_switch}})
-      find_package(${dep} REQUIRED)
+      find_package_with_ver(${dep} ${version} REQUIRED)
       set(_required True)
     endif()
 
@@ -592,6 +634,7 @@ function(core_find_git_rev stamp)
   else()
     find_package(Git)
     if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
+      # get tree status i.e. clean working tree vs dirty (uncommited or unstashed changes, etc.)
       execute_process(COMMAND ${GIT_EXECUTABLE} update-index --ignore-submodules -q --refresh
                       WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
       execute_process(COMMAND ${GIT_EXECUTABLE} diff-files --ignore-submodules --quiet --
@@ -602,21 +645,21 @@ function(core_find_git_rev stamp)
                         RESULT_VARIABLE status_code
                         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
         endif()
+        # get HEAD commit SHA-1
+        execute_process(COMMAND ${GIT_EXECUTABLE} log -n 1 --pretty=format:"%h" HEAD
+                        OUTPUT_VARIABLE HASH
+                        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+        string(REPLACE "\"" "" HASH ${HASH})
+
         if(status_code)
-          execute_process(COMMAND ${GIT_EXECUTABLE} log -n 1 --pretty=format:"%h-dirty" HEAD
-                          OUTPUT_VARIABLE HASH
-                          WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-          string(SUBSTRING ${HASH} 1 13 HASH)
-        else()
-          execute_process(COMMAND ${GIT_EXECUTABLE} log -n 1 --pretty=format:"%h" HEAD
-                          OUTPUT_VARIABLE HASH
-                          WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-          string(SUBSTRING ${HASH} 1 7 HASH)
+          string(CONCAT HASH ${HASH} "-dirty")
         endif()
+
+      # get HEAD commit date
       execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --pretty=format:"%cd" --date=short HEAD
                       OUTPUT_VARIABLE DATE
                       WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-      string(SUBSTRING ${DATE} 1 10 DATE)
+      string(REPLACE "\"" "" DATE ${DATE})
       string(REPLACE "-" "" DATE ${DATE})
     else()
       string(TIMESTAMP DATE "%Y%m%d" UTC)
diff --git a/cmake/scripts/common/Uninstall.cmake b/cmake/scripts/common/Uninstall.cmake
index 5660e19..5753857 100644
--- a/cmake/scripts/common/Uninstall.cmake
+++ b/cmake/scripts/common/Uninstall.cmake
@@ -1,9 +1,40 @@
+macro(remove_empty_dirs)
+  list(REMOVE_DUPLICATES DIRECTORIES)
+  unset(PDIRECTORIES)
+  foreach(dir IN LISTS DIRECTORIES)
+    if(EXISTS $ENV{DESTDIR}${dir})
+      file(GLOB _res $ENV{DESTDIR}${dir}/*)
+      list(LENGTH _res _len)
+      if(_len EQUAL 0 AND EXISTS $ENV{DESTDIR}${dir})
+        message(STATUS "Removing empty dir: ${dir}")
+        execute_process(
+          COMMAND ${CMAKE_COMMAND} -E remove_directory $ENV{DESTDIR}${dir}
+          OUTPUT_VARIABLE rm_out
+          RESULT_VARIABLE rm_retval
+        )
+        if(NOT "${rm_retval}" STREQUAL 0)
+          message(FATAL_ERROR "Failed to remove directory: $ENV{DESTDIR}${dir}")
+        endif()
+        get_filename_component(_pdir $ENV{DESTDIR}${dir} DIRECTORY)
+        list(APPEND PDIRECTORIES ${_pdir})
+      endif()
+    endif()
+  endforeach()
+  list(LENGTH PDIRECTORIES _plen)
+  if(_plen GREATER 0)
+    set(DIRECTORIES ${PDIRECTORIES})
+    remove_empty_dirs()
+  endif()
+endmacro()
+
 # Uninstall target
 set(MANIFEST ${CMAKE_CURRENT_BINARY_DIR}/install_manifest.txt)
 if(EXISTS ${MANIFEST})
   file(STRINGS ${MANIFEST} files)
     foreach(file IN LISTS files)
       if(EXISTS $ENV{DESTDIR}${file})
+        get_filename_component(_dir $ENV{DESTDIR}${file} DIRECTORY)
+        list(APPEND DIRECTORIES $ENV{DESTDIR}${_dir})
         message(STATUS "Uninstalling: ${file}")
         execute_process(
           COMMAND ${CMAKE_COMMAND} -E remove $ENV{DESTDIR}${file}
@@ -17,6 +48,11 @@ if(EXISTS ${MANIFEST})
         message(STATUS "File does not exist: $ENV{DESTDIR}${file}")
       endif()
     endforeach(file)
+
+    # delete empty dirs
+    if(DIRECTORIES)
+      remove_empty_dirs()
+    endif()
 else()
   message(STATUS "Cannot find install manifest: '${MANIFEST}'")
 endif()