[vcpkg_configure_make] Misc fixes

scripts/azure-pipelines/azure-pipelines.yml

@@ -16,7 +16,7 @@ parameters:
   - name: tripletPattern
     displayName: 'Enable triplets which contain this substring'
     type: string
-    default: '-'
+    default: '^x64-uwp$'
 
 jobs:
 - template: windows/azure-pipelines.yml
@@ -112,4 +112,4 @@ jobs:
     poolName: $(android-pool)
     dockerImage: $(linux-docker-image)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
-    tripletPattern: ${{ parameters.tripletPattern }}
+    tripletPattern: ${{ parameters.tripletPattern }}

scripts/cmake/vcpkg_configure_make.cmake

@@ -116,10 +116,6 @@ macro(z_vcpkg_append_to_configure_environment inoutstring var defaultval)
     endif()
 endmacro()
 
-macro(z_convert_to_list input output)
-    string(REGEX MATCHALL "(( +|^ *)[^ ]+)" ${output} "${${input}}")
-endmacro()
-
 function(vcpkg_configure_make)
     # parse parameters such that semicolons in options arguments to COMMAND don't get erased
     cmake_parse_arguments(PARSE_ARGV 0 arg
@@ -168,7 +164,10 @@ function(vcpkg_configure_make)
     if(EXISTS "${src_dir}/configure" AND EXISTS "${src_dir}/configure.ac" AND arg_AUTOCONFIG) # remove configure; rerun autoconf
         set(requires_autoconfig ON)
         file(REMOVE "${SRC_DIR}/configure") # remove possible outdated configure scripts
-    elseif(EXISTS "${src_dir}/configure" AND NOT arg_SKIP_CONFIGURE) # run normally; no autoconf or autogen required
+    elseif(arg_SKIP_CONFIGURE)
+        # no action requested
+    elseif(EXISTS "${src_dir}/configure")
+        # run normally; no autoconf or autogen required
     elseif(EXISTS "${src_dir}/configure.ac") # Run autoconfig
         set(requires_autoconfig ON)
         set(arg_AUTOCONFIG ON)
@@ -573,11 +572,10 @@ function(vcpkg_configure_make)
         endif()
     endif()
 
-    z_convert_to_list(VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES c_libs_list)
-    z_convert_to_list(VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES cxx_libs_list)
-    set(all_libs_list ${c_libs_list} ${cxx_libs_list})
-    list(REMOVE_DUPLICATES all_libs_list)
-    list(TRANSFORM all_libs_list STRIP)
+    separate_arguments(c_libs_list NATIVE_COMMAND "${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES}")
+    separate_arguments(cxx_libs_list NATIVE_COMMAND "${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}")
+    list(REMOVE_ITEM cxx_libs_list ${c_libs_list})
+    set(all_libs_list ${cxx_libs_list} ${c_libs_list})
     #Do lib list transformation from name.lib to -lname if necessary
     set(x_vcpkg_transform_libs ON)
     if(VCPKG_TARGET_IS_UWP)
@@ -587,24 +585,20 @@ function(vcpkg_configure_make)
         # Note: Env LIBPATH;LIB are on the search path for libtool by default on windows. 
         # It even does unix/dos-short/unix transformation with the path to get rid of spaces. 
     endif()
-    set(l_prefix)
     if(x_vcpkg_transform_libs)
-        set(l_prefix "-l")
-        list(TRANSFORM all_libs_list REPLACE "(.dll.lib|.lib|.a|.so)$" "")
+        list(TRANSFORM all_libs_list REPLACE "[.](dll[.]lib|lib|a|so)$" "")
         if(VCPKG_TARGET_IS_WINDOWS)
             list(REMOVE_ITEM all_libs_list "uuid")
         endif()
-        list(TRANSFORM all_libs_list REPLACE "^(${l_prefix})" "")
-    endif()
-    list(JOIN all_libs_list " ${l_prefix}" all_libs_string)
-    if(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-        # libtool must be told explicitly that there is no dynamic linkage for uuid.
-        # The "-Wl,..." syntax is understood by libtool and gcc, but no by ld.
-        string(REPLACE " -luuid" " -Wl,-Bstatic,-luuid,-Bdynamic" all_libs_string "${all_libs_string}")
+        list(TRANSFORM all_libs_list REPLACE "^([^-].*)" "-l\\1")
+        if(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+            # libtool must be told explicitly that there is no dynamic linkage for uuid.
+            # The "-Wl,..." syntax is understood by libtool and gcc, but no by ld.
+            list(TRANSFORM all_libs_list REPLACE "^-luuid\$" "-Wl,-Bstatic,-luuid,-Bdynamic")
+        endif()
     endif()
-
-    if(all_libs_string)
-        set(all_libs_string "${l_prefix}${all_libs_string}")
+    if(all_libs_list)
+        list(JOIN all_libs_list " " all_libs_string)
         if(DEFINED ENV{LIBS})
             set(ENV{LIBS} "$ENV{LIBS} ${all_libs_string}")
         else()
@@ -671,56 +665,52 @@ function(vcpkg_configure_make)
     endif()
 
     macro(z_vcpkg_setup_make_linker_flags_vars var_suffix)
-        if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-            set(LINKER_FLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${var_suffix}}")
-        else() # dynamic
-            set(LINKER_FLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${var_suffix}}")
-        endif()
-        set(ARFLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${var_suffix}}")
-        set(LDFLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${var_suffix}}")
-        if (CMAKE_HOST_WIN32 AND VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES [[cl\.exe$]])
-            if(NOT vcm_paths_with_spaces)
-                string(APPEND LDFLAGS_${var_suffix} " -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link")
+        set(arflags "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${var_suffix}}")
+        if(arflags)
+            # ARFLAGS need to know the command for creating an archive (Maybe needs user customization?)
+            # or extract it from CMake via CMAKE_${lang}_ARCHIVE_CREATE ?
+            # or from CMAKE_${lang}_${rule} with rule being one of CREATE_SHARED_MODULE CREATE_SHARED_LIBRARY LINK_EXECUTABLE
+            string(PREPEND arflags "cr ")
+        endif()
+        string(STRIP "${arflags}" ARFLAGS_${var_suffix})
+
+        set(ldflags "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${var_suffix}}")
+        # Could use a future VCPKG_DETECTED_CMAKE_LIBRARY_PATH_FLAG
+        set(library_path_flag "-L")
+        # Could use a future VCPKG_DETECTED_MSVC
+        if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_DETECTED_CMAKE_LINKER MATCHES [[link\.exe$]])
+            set(library_path_flag "-LIBPATH:")
+        endif()
+        set(linker_flag_escape "")
+        if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES [[cl\.exe$]])
+            # Removed by libtool
+            set(linker_flag_escape "-Xlinker ")
+            if(arg_USE_WRAPPERS)
+                 # 1st and 3rd are removed by libtool, 2nd by wrapper
+                 set(linker_flag_escape "-Xlinker -Xlinker -Xlinker ")
+            endif()
+            if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+                set(linker_flags "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${var_suffix}}")
+            else() # dynamic
+                set(linker_flags "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${var_suffix}}")
             endif()
             if(DEFINED ENV{_LINK_})
-                set(LINK_ENV_${var_suffix} "$ENV{_LINK_} ${LINKER_FLAGS_${var_suffix}}")
+                set(LINK_ENV_${var_suffix} "$ENV{_LINK_} ${linker_flags}")
             else()
-                set(LINK_ENV_${var_suffix} "${LINKER_FLAGS_${var_suffix}}")
-            endif()
-        else()
-            set(link_required_dirs "")
-            if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib")
-                set(link_required_dirs "-L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib")
-            endif()
-            if(EXISTS "{CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib/manual-link")
-                set(link_required_dirs "${link_required_dirs} -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link")
-            endif()
-            string(STRIP "${link_required_dirs}" link_required_dirs)
-            if(link_required_dirs)
-                string(PREPEND LDFLAGS_${var_suffix} "${link_required_dirs} ")
-                # ARFLAGS doesn't need -L search paths since it just bundles object files
-            endif()
-            if(ARFLAGS_${var_suffix})
-                # ARFLAGS need to know the command for creating an archive (Maybe needs user customization?)
-                # or extract it from CMake via CMAKE_${lang}_ARCHIVE_CREATE ?
-                # or from CMAKE_${lang}_${rule} with rule being one of CREATE_SHARED_MODULE CREATE_SHARED_LIBRARY LINK_EXECUTABLE
-                string(PREPEND ARFLAGS_${var_suffix} "cr ")
-            endif()
-            string(STRIP "${LDFLAGS_${var_suffix}}" LDFLAGS_${var_suffix})
-            string(STRIP "${ARFLAGS_${var_suffix}}" ARFLAGS_${var_suffix})
-            if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_DETECTED_CMAKE_LINKER MATCHES [[link\.exe$]])
-                # Do not touch autotools quirks incoming!
-                # -Xlinker is repeated three times because:
-                # - libtool script eats -Xlinker
-                # - the compile wrapper eats -Xlinker
-                # - passing through both tools requires 3 -Xlinker; two being eaten in the first script.
-                # passing only through one script will keep one -Xlinker (done in configure)
-                # but cl will just ignore those with a warning. (Just like -Xcompiler)
-                separate_arguments(LDFLAGS_LIST NATIVE_COMMAND "${LDFLAGS_${var_suffix}}")
-                list(JOIN LDFLAGS_LIST " -Xlinker -Xlinker -Xlinker " LDFLAGS_${var_suffix})
-                string(PREPEND LDFLAGS_${var_suffix} "-Xlinker -Xlinker -Xlinker ")
+                set(LINK_ENV_${var_suffix} "${linker_flags}")
             endif()
+            separate_arguments(ldflags_list NATIVE_COMMAND "${ldflags}")
+            list(TRANSFORM ldflags_list REPLACE " " "\\\\ ")
+            list(TRANSFORM ldflags_list PREPEND "${linker_flag_escape}")
+            list(JOIN ldflags_list " " ldflags)
+        endif()
+        if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib/manual-link")
+            string(PREPEND ldflags "${linker_flag_escape}${library_path_flag}${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link ")
+        endif()
+        if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib")
+            string(PREPEND ldflags "${linker_flag_escape}${library_path_flag}${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib ")
         endif()
+        string(STRIP "${ldflags}" LDFLAGS_${var_suffix})
     endmacro()
 
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug" AND NOT arg_NO_DEBUG)