[vcpkg baseline][qt5-base] Fix glib link issues on linux (#16954)

* [qt5-base] fix glib link issues on linux

* add version

* remove unused vars

* update version

* write port info file.

* version stuff

* remove paraview from baseline. It was added due to the same spurious glib failures.

* trying out a different approach

* more changes

* change the if to actually use the buildtype instead

* remove x_vcpkg_get_port_info

* add option QT_OPENSSL_LINK back in

* use INCLUDE_DIRS_(DEBUG|RELEASE) instead of just INCLUDE_DIRS

* regen docs

* remove function call I forgot to remove

* [vcpkg-pkgconfig-get-modules] Move to port

* revert changes to ports.cmake

* include the file in qt5-base

* fix path

* remove unnecessary include

* Apply suggestions from code review

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* Apply suggestions from code review

* update version

* ws removal

* version stuff

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

1 files changed, 15 insertions, 14 deletions

diff --git a/ports/qt5-base/cmake/qt_build_submodule.cmake b/ports/qt5-base/cmake/qt_build_submodule.cmake
index b30ef0299..52f9c6c1b 100644
--- a/ports/qt5-base/cmake/qt_build_submodule.cmake
+++ b/ports/qt5-base/cmake/qt_build_submodule.cmake
@@ -6,19 +6,20 @@ function(qt_build_submodule SOURCE_PATH)
     vcpkg_find_acquire_program(PYTHON2)

     get_filename_component(PYTHON2_EXE_PATH ${PYTHON2} DIRECTORY)

     vcpkg_add_to_path("${PYTHON2_EXE_PATH}")

-    

+

     vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH} ${ARGV})

 

     vcpkg_build_qmake(SKIP_MAKEFILES)

-    

+

     #Fix the installation location within the makefiles

     qt_fix_makefile_install("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/")

     qt_fix_makefile_install("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/")

     

     #Install the module files

     vcpkg_build_qmake(TARGETS install SKIP_MAKEFILES BUILD_LOGNAME install)

-    

+

     qt_fix_cmake(${CURRENT_PACKAGES_DIR} ${PORT})

+    vcpkg_fixup_pkgconfig() # Needs further investigation if this is enough!

 

     #Replace with VCPKG variables if PR #7733 is merged

     unset(BUILDTYPES)

@@ -26,13 +27,13 @@ function(qt_build_submodule SOURCE_PATH)
         set(_buildname "DEBUG")

         list(APPEND BUILDTYPES ${_buildname})

         set(_short_name_${_buildname} "dbg")

-        set(_path_suffix_${_buildname} "/debug")        

+        set(_path_suffix_${_buildname} "/debug")

     endif()

     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")

         set(_buildname "RELEASE")

         list(APPEND BUILDTYPES ${_buildname})

         set(_short_name_${_buildname} "rel")

-        set(_path_suffix_${_buildname} "")        

+        set(_path_suffix_${_buildname} "")

     endif()

     unset(_buildname)

 

@@ -42,14 +43,14 @@ function(qt_build_submodule SOURCE_PATH)
         file(GLOB_RECURSE PRL_FILES "${CURRENT_BUILD_PACKAGE_DIR}/lib/*.prl" "${CURRENT_PACKAGES_DIR}/tools/qt5${_path_suffix_${_buildname}}/lib/*.prl" 

                                     "${CURRENT_PACKAGES_DIR}/tools/qt5${_path_suffix_${_buildname}}/mkspecs/*.pri")

         qt_fix_prl("${CURRENT_BUILD_PACKAGE_DIR}" "${PRL_FILES}")

-        

+

         # This makes it impossible to use the build tools in any meaningful way. qt5 assumes they are all in one folder!

         # So does the Qt VS Plugin which even assumes all of the in a bin folder  

         #Move tools to the correct directory

         #if(EXISTS ${CURRENT_BUILD_PACKAGE_DIR}/tools/qt5)

         #    file(RENAME ${CURRENT_BUILD_PACKAGE_DIR}/tools/qt5 ${CURRENT_PACKAGES_DIR}/tools/${PORT})

         #endif()

-        

+

         # Move executables in bin to tools

         # This is ok since those are not build tools.

         file(GLOB PACKAGE_EXE ${CURRENT_BUILD_PACKAGE_DIR}/bin/*.exe)

@@ -64,13 +65,13 @@ function(qt_build_submodule SOURCE_PATH)
                 endif()

             endforeach()

         endif()

-        

+

         #cleanup empty folders

         file(GLOB PACKAGE_LIBS "${CURRENT_BUILD_PACKAGE_DIR}/lib/*")

         if(NOT PACKAGE_LIBS)

             file(REMOVE_RECURSE "${CURRENT_BUILD_PACKAGE_DIR}/lib")

         endif()

-        

+

         file(GLOB PACKAGE_BINS "${CURRENT_BUILD_PACKAGE_DIR}/bin/*")

         if(NOT PACKAGE_BINS)

             file(REMOVE_RECURSE "${CURRENT_BUILD_PACKAGE_DIR}/bin")

@@ -78,12 +79,12 @@ function(qt_build_submodule SOURCE_PATH)
     endforeach()

     if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/qt5/bin")

         file(COPY "${CURRENT_PACKAGES_DIR}/tools/qt5/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")

-        

+

         set(CURRENT_INSTALLED_DIR_BACKUP "${CURRENT_INSTALLED_DIR}")

         set(CURRENT_INSTALLED_DIR "./../../.." ) # Making the qt.conf relative and not absolute

         configure_file(${CURRENT_INSTALLED_DIR_BACKUP}/tools/qt5/qt_release.conf ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/qt.conf) # This makes the tools at least useable for release

         set(CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR_BACKUP}")

-        

+

         vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin")

         if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")

             file(GLOB_RECURSE DLL_DEPS_AVAIL "${CURRENT_INSTALLED_DIR}/tools/qt5/bin/*.dll")

@@ -99,14 +100,14 @@ function(qt_build_submodule SOURCE_PATH)
             endforeach()

         endif()

     endif()

-    

+

     #This should be removed if somehow possible

     if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/qt5/debug/bin")

         set(CURRENT_INSTALLED_DIR_BACKUP "${CURRENT_INSTALLED_DIR}")

         set(CURRENT_INSTALLED_DIR "./../../../.." ) # Making the qt.conf relative and not absolute

         configure_file(${CURRENT_INSTALLED_DIR_BACKUP}/tools/qt5/qt_debug.conf ${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/qt.conf) # This makes the tools at least useable for release

         set(CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR_BACKUP}")

-        

+

         vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin")

         if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")

             file(GLOB_RECURSE DLL_DEPS_AVAIL "${CURRENT_INSTALLED_DIR}/tools/qt5/debug/bin/*.dll")

@@ -122,5 +123,5 @@ function(qt_build_submodule SOURCE_PATH)
             endforeach()

         endif()

     endif()

-    

+

 endfunction()
\ No newline at end of file