Merge branch 'master' into vcpkg_nuget

6 files changed, 110 insertions, 16 deletions

diff --git a/ports/glbinding/force-system-install.patch b/ports/glbinding/0001_force-system-install.patch
index 1674f145a..1674f145a 100644
--- a/ports/glbinding/force-system-install.patch
+++ b/ports/glbinding/0001_force-system-install.patch
diff --git a/ports/glbinding/fix-uwpmacro.patch b/ports/glbinding/0002_fix-uwpmacro.patch
index 61c179662..61c179662 100644
--- a/ports/glbinding/fix-uwpmacro.patch
+++ b/ports/glbinding/0002_fix-uwpmacro.patch
diff --git a/ports/glbinding/0003_fix-cmake-configs-paths.patch b/ports/glbinding/0003_fix-cmake-configs-paths.patch
new file mode 100644
index 000000000..359837784
--- /dev/null
+++ b/ports/glbinding/0003_fix-cmake-configs-paths.patch
@@ -0,0 +1,62 @@
+diff --git a/3rdparty/KHR/CMakeLists.txt b/3rdparty/KHR/CMakeLists.txt
+index 25fac3a..429544f 100644
+--- a/3rdparty/KHR/CMakeLists.txt
++++ b/3rdparty/KHR/CMakeLists.txt
+@@ -43,7 +43,7 @@ add_library(${target} INTERFACE)
+ add_library(externals::${target} ALIAS ${target})
+ 
+ # Export library for downstream projects
+-export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/cmake/${target}/${target}-export.cmake)
++export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/${target}-export.cmake)
+ 
+ 
+ #
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 700b48b..8aaab8d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -141,15 +141,15 @@ endif()
+ if(1)
+     # Install into the system (/usr/bin or /usr/local/bin)
+     set(INSTALL_ROOT      "share/${project}")       # /usr/[local]/share/<project>
+-    set(INSTALL_CMAKE     "share/${project}/cmake") # /usr/[local]/share/<project>/cmake
++    set(INSTALL_CMAKE     "share/${project}") # /usr/[local]/share/<project>/cmake
+     set(INSTALL_EXAMPLES  "share/${project}")       # /usr/[local]/share/<project>
+     set(INSTALL_DATA      "share/${project}")       # /usr/[local]/share/<project>
+     set(INSTALL_BIN       "bin")                    # /usr/[local]/bin
+     set(INSTALL_SHARED    "lib")                    # /usr/[local]/lib
+     set(INSTALL_LIB       "lib")                    # /usr/[local]/lib
+     set(INSTALL_INCLUDE   "include")                # /usr/[local]/include
+-    set(INSTALL_DOC       "share/doc/${project}")   # /usr/[local]/share/doc/<project>
+-    set(INSTALL_SHORTCUTS "share/applications")     # /usr/[local]/share/applications
++    set(INSTALL_DOC       "share/${project}/doc")   # /usr/[local]/share/doc/<project>
++    set(INSTALL_SHORTCUTS "share/${project}/applications")     # /usr/[local]/share/applications
+     set(INSTALL_ICONS     "share/pixmaps")          # /usr/[local]/share/pixmaps
+     set(INSTALL_INIT      "etc/init")              # /etc/init (upstart init scripts)
+ else()
+diff --git a/source/glbinding-aux/CMakeLists.txt b/source/glbinding-aux/CMakeLists.txt
+index 61cc166..cb0758a 100644
+--- a/source/glbinding-aux/CMakeLists.txt
++++ b/source/glbinding-aux/CMakeLists.txt
+@@ -137,7 +137,7 @@ add_library(${target}
+ add_library(${META_PROJECT_NAME}::${target} ALIAS ${target})
+ 
+ # Export library for downstream projects
+-export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/cmake/${target}/${target}-export.cmake)
++export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/${target}-export.cmake)
+ 
+ # Create API export header
+ generate_export_header(${target}
+diff --git a/source/glbinding/CMakeLists.txt b/source/glbinding/CMakeLists.txt
+index bca68d1..f014494 100644
+--- a/source/glbinding/CMakeLists.txt
++++ b/source/glbinding/CMakeLists.txt
+@@ -172,7 +172,7 @@ add_library(${target}
+ add_library(${META_PROJECT_NAME}::${target} ALIAS ${target})
+ 
+ # Export library for downstream projects
+-export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/cmake/${target}/${target}-export.cmake)
++export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/${target}-export.cmake)
+ 
+ # Create API export header
+ generate_export_header(${target}
diff --git a/ports/glbinding/0004_fix-config-expected-paths.patch b/ports/glbinding/0004_fix-config-expected-paths.patch
new file mode 100644
index 000000000..e6fb16440
--- /dev/null
+++ b/ports/glbinding/0004_fix-config-expected-paths.patch
@@ -0,0 +1,35 @@
+diff --git a/glbinding-config.cmake b/glbinding-config.cmake
+index 03fc505..01b6cc8 100644
+--- a/glbinding-config.cmake
++++ b/glbinding-config.cmake
+@@ -1,7 +1,7 @@
+ 
+ # This config script tries to locate the project either in its source tree
+ # or from an install location.
+-# 
++#
+ # Please adjust the list of submodules to search for.
+ 
+ 
+@@ -35,20 +35,11 @@ endmacro()
+ 
+ # Try install location
+ set(MODULE_FOUND FALSE)
+-find_modules("cmake")
++find_modules(".")
+ 
+ if(MODULE_FOUND)
+     return()
+ endif()
+ 
+-# Try common build locations
+-if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+-    find_modules("build-debug/cmake")
+-    find_modules("build/cmake")
+-else()
+-    find_modules("build/cmake")
+-    find_modules("build-debug/cmake")
+-endif()
+-
+ # Signal success/failure to CMake
+ set(glbinding_FOUND ${MODULE_FOUND})
diff --git a/ports/glbinding/CONTROL b/ports/glbinding/CONTROL
index 016283ca9..5bef7210a 100644
--- a/ports/glbinding/CONTROL
+++ b/ports/glbinding/CONTROL
@@ -1,5 +1,5 @@
 Source: glbinding
-Version: 3.1.0-1
+Version: 3.1.0-2
 Description: glbinding is an MIT licensed, cross-platform C++ binding for the OpenGL API
 Homepage: https://github.com/cginternals/glbinding
 Build-Depends: egl-registry
diff --git a/ports/glbinding/portfile.cmake b/ports/glbinding/portfile.cmake
index 99f233982..863426282 100644
--- a/ports/glbinding/portfile.cmake
+++ b/ports/glbinding/portfile.cmake
@@ -5,36 +5,35 @@ vcpkg_from_github(
     REF v3.1.0
     SHA512 d7294c9a0dc47a7c107b134e5dfa78c5812fc6bf739b9fd778fa7ce946d5ea971839a65c3985e0915fd75311e4a85fb221d33a71856c460199eab0e7622f7151
     HEAD_REF master
-    PATCHES 
-        force-system-install.patch
-        fix-uwpmacro.patch
+    PATCHES
+        0001_force-system-install.patch
+        0002_fix-uwpmacro.patch
+        0003_fix-cmake-configs-paths.patch
+        0004_fix-config-expected-paths.patch
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
     OPTIONS
         -DOPTION_BUILD_TESTS=OFF
         -DOPTION_BUILD_GPU_TESTS=OFF
         -DOPTION_BUILD_TOOLS=OFF
+        -DOPTION_BUILD_EXAMPLES=OFF
         -DGIT_REV=0
         -DCMAKE_DISABLE_FIND_PACKAGE_cpplocate=ON
         -DOPTION_BUILD_EXAMPLES=OFF
 )
 
 vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/glbinding)
+vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/glbinding/cmake)
-
-# _IMPORT_PREFIX needs to go up one extra level in the directory tree.
-# These files should be modified.
-#     /share/glbinding/glbinding-export.cmake 
-#     /share/glbinding-aux/glbinding-aux-export.cmake
+## _IMPORT_PREFIX needs to go up one extra level in the directory tree.
 file(GLOB_RECURSE TARGET_CMAKES "${CURRENT_PACKAGES_DIR}/*-export.cmake")
 foreach(TARGET_CMAKE IN LISTS TARGET_CMAKES)
     file(READ ${TARGET_CMAKE} _contents)
-    string(REPLACE 
+    string(REPLACE
 [[
 get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
 get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
@@ -50,13 +49,11 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
     file(WRITE ${TARGET_CMAKE} "${_contents}")
 endforeach()
 
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/glbinding/glbinding-config.cmake "include(\${CMAKE_CURRENT_LIST_DIR}/glbinding/glbinding-export.cmake)\ninclude(\${CMAKE_CURRENT_LIST_DIR}/glbinding-aux/glbinding-aux-export.cmake)\ninclude(\${CMAKE_CURRENT_LIST_DIR}/KHRplatform/KHRplatform-export.cmake)\nset(glbinding_FOUND TRUE)\n")
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Remove files already published by egl-registry
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/KHR)
 
 # Handle copyright
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/glbinding/LICENSE ${CURRENT_PACKAGES_DIR}/share/glbinding/copyright)
-
-vcpkg_copy_pdbs()