[rttr] Update 0.9.6. (fixes #5710) (#5712)

* Update rttr library to 0.9.6. (fixes #5710)

* Add log message for not supported platform. (see #5710)

5 files changed, 66 insertions, 68 deletions

diff --git a/ports/rttr/CONTROL b/ports/rttr/CONTROL
index 50aa21724..cb4eb9557 100644
--- a/ports/rttr/CONTROL
+++ b/ports/rttr/CONTROL
@@ -1,3 +1,3 @@
 Source: rttr
-Version: 0.9.5-3
+Version: 0.9.6-0
 Description: an easy and intuitive way to use reflection in C++
diff --git a/ports/rttr/disable-unit-tests.patch b/ports/rttr/disable-unit-tests.patch
deleted file mode 100644
index b27f01661..000000000
--- a/ports/rttr/disable-unit-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b9fd698..bcaebfe 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -31,7 +31,9 @@
- #############################################
- 
- add_subdirectory (rttr)
-+if(UNIT_TESTS)
- add_subdirectory (unit_tests)
-+endif()
- 
- if (${BUILD_BENCHMARKS})
-     add_subdirectory (benchmarks)
diff --git a/ports/rttr/fix-directory-output.patch b/ports/rttr/fix-directory-output.patch
index b83fc455c..8fd8ed0c7 100644
--- a/ports/rttr/fix-directory-output.patch
+++ b/ports/rttr/fix-directory-output.patch
@@ -1,10 +1,13 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d64ee41..e33e7bf 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,4 +76,4 @@ add_subdirectory(src)
- add_subdirectory(doc) 
+diff --git a/CMake/config.cmake b/CMake/config.cmake
+index a718199..eab64c2 100644
+--- a/CMake/config.cmake
++++ b/CMake/config.cmake
+@@ -47,7 +47,7 @@ set(CMAKE_EXECUTABLE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
  
  # here we specify the installation directory
--set(CMAKE_INSTALL_PREFIX ${RTTR_INSTALL_DIR} CACHE PATH  "RTTR install prefix" FORCE)
-+set(CMAKE_INSTALL_PREFIX ${RTTR_INSTALL_DIR} CACHE PATH  "RTTR install prefix")
+ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+-  set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/install" CACHE PATH  "RTTR install prefix" FORCE)
++  #set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/install" CACHE PATH  "RTTR install prefix")
+ endif()
+ 
+ # in order to group in visual studio the targets into solution filters
diff --git a/ports/rttr/portfile.cmake b/ports/rttr/portfile.cmake
index 8ce171cc6..ceef04449 100644
--- a/ports/rttr/portfile.cmake
+++ b/ports/rttr/portfile.cmake
@@ -10,12 +10,11 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO rttrorg/rttr
-    REF v0.9.5
-    SHA512 b451f24fd4bdc4b7d9ecabdb6fd261744852e68357ec36573109354a25f2bf494908b9d4174602b59dd5005c42ba8edc3b35ec1d1386384db421805ac9994608
+    REF v0.9.6
+    SHA512 5c94f037b319568d351ee6d25f1404adce00b40598dce4a331789d5357c059e50aae3894f90e60d37307b7e96f4672ae09d3798bbe47f796ef2044f1ac6f9e50
     HEAD_REF master
     PATCHES
         fix-directory-output.patch
-        disable-unit-tests.patch
         remove-owner-read-perms.patch
 )
 
@@ -24,11 +23,18 @@ vcpkg_configure_cmake(
     PREFER_NINJA
     OPTIONS
         -DBUILD_BENCHMARKS=OFF
+        -DBUILD_UNIT_TESTS=OFF
 )
 
 vcpkg_install_cmake()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+if(UNIX)
+	vcpkg_fixup_cmake_targets(CONFIG_PATH share/rttr/cmake)
+elseif(WIN32)
+	vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+else()
+	message(FATAL_ERROR "RTTR does not support this platform")
+endif()
 
 #Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/rttr)
diff --git a/ports/rttr/remove-owner-read-perms.patch b/ports/rttr/remove-owner-read-perms.patch
index 918de14cc..3fc98422d 100644
--- a/ports/rttr/remove-owner-read-perms.patch
+++ b/ports/rttr/remove-owner-read-perms.patch
@@ -1,41 +1,44 @@
-diff --git a/CMake/config.cmake b/CMake/config.cmake

-index 1d753b3..393e3d0 100644

---- a/CMake/config.cmake

-+++ b/CMake/config.cmake

-@@ -131,4 +131,4 @@ install(

- 

- install(FILES "${LICENSE_FILE}" "${README_FILE}"

-         DESTINATION "."

--        PERMISSIONS OWNER_READ)

-+        )

-diff --git a/CMake/utility.cmake b/CMake/utility.cmake

-index 9dbc172..c37671e 100644

---- a/CMake/utility.cmake

-+++ b/CMake/utility.cmake

-@@ -165,7 +165,7 @@ function(loadFolder FOLDER _HEADER_FILES _SOURCE_FILES)

-     # we don't want to install header files which are marked as private

-     if (${shouldInstall})

-       if (NOT ${FULL_HEADER_PATH} MATCHES ".*_p.h$")

--        install(FILES ${FULL_HEADER_PATH} DESTINATION "include/${DIRNAME}/${REL_PATH}" PERMISSIONS OWNER_READ)

-+        install(FILES ${FULL_HEADER_PATH} DESTINATION "include/${DIRNAME}/${REL_PATH}")

-       endif()

-     endif()

-   endforeach()

-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt

-index ec10eaf..454c41e 100644

---- a/doc/CMakeLists.txt

-+++ b/doc/CMakeLists.txt

-@@ -127,11 +127,11 @@ add_custom_target(doc ALL

- install(DIRECTORY "${DOXYGEN_OUTPUT_DIRECTORY}/${DOXYGEN_CUSTOM_HTML_DIR}" 

-         DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}"

-         PATTERN "*.*"

--        PERMISSIONS OWNER_READ)

-+        )

-         

- install(FILES "${DOXYGEN_OUTPUT_DIRECTORY}/${DOXYGEN_INDEX_FILE}" 

-         DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}" 

--        PERMISSIONS OWNER_READ)

-+        )

-         

- #########################################################################################

-                   

+diff --git a/CMake/config.cmake b/CMake/config.cmake
+index 4483900..dfef016 100644
+--- a/CMake/config.cmake
++++ b/CMake/config.cmake
+@@ -171,6 +171,5 @@ if (BUILD_INSTALLER)
+             COMPONENT Devel)
+ 
+     install(FILES "${LICENSE_FILE}" "${README_FILE}"
+-            DESTINATION ${RTTR_ADDITIONAL_FILES_INSTALL_DIR}
+-            PERMISSIONS OWNER_READ)
++            DESTINATION ${RTTR_ADDITIONAL_FILES_INSTALL_DIR})
+ endif()
+diff --git a/CMake/utility.cmake b/CMake/utility.cmake
+index 7e1f677..a3932ae 100644
+--- a/CMake/utility.cmake
++++ b/CMake/utility.cmake
+@@ -165,7 +165,7 @@ function(loadFolder FOLDER _HEADER_FILES _SOURCE_FILES)
+     getNameOfDir(CMAKE_CURRENT_SOURCE_DIR DIRNAME)
+     if (${shouldInstall})
+       if (NOT ${FULL_HEADER_PATH} MATCHES ".*_p.h$") # we don't want to install header files which are marked as private
+-        install(FILES ${FULL_HEADER_PATH} DESTINATION "include/${DIRNAME}/${REL_PATH}" PERMISSIONS OWNER_READ)
++        install(FILES ${FULL_HEADER_PATH} DESTINATION "include/${DIRNAME}/${REL_PATH}")
+       endif()
+     endif()
+   endforeach()
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index bacb280..a92d642 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -132,12 +132,10 @@ set_target_properties(doc PROPERTIES FOLDER "Documentation")
+ 
+ install(DIRECTORY "${DOXYGEN_OUTPUT_DIRECTORY}/${DOXYGEN_CUSTOM_HTML_DIR}"
+         DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}"
+-        PATTERN "*.*"
+-        PERMISSIONS OWNER_READ)
++        PATTERN "*.*")
+ 
+ install(FILES "${DOXYGEN_OUTPUT_DIRECTORY}/${DOXYGEN_INDEX_FILE}"
+-        DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}"
+-        PERMISSIONS OWNER_READ)
++        DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}")
+ 
+ #########################################################################################
+