mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 17:12:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[scripts-audit] CMake buildsystem (#20885)

Browse Source 
* [scripts-audit] vcpkg_configure_cmake

Start auditing vcpkg_configure_cmake

* [scripts-audit] vcpkg_build_cmake

* [scripts-audit] vcpkg_install_cmake

* wow that was a dumb bug

* fix x86 configure, fix `if` guidelines

* Billy's CRs

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
This commit is contained in:
nicole mazzuca 2021-11-05 16:55:14 -07:00 committed by GitHub
parent efdf9346ab
commit 297f1b8ea0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 201 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/maintainers/vcpkg_build_cmake.md
View File

@ -20,7 +20,7 @@ The target passed to the cmake build command (`cmake --build . --target <target>
be passed. be passed.
### ADD_BIN_TO_PATH ### ADD_BIN_TO_PATH
Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs. Adds the appropriate Release and Debug `bin` directories to the path during the build such that executables can run against the in-tree DLLs.
## Notes: ## Notes:
This command should be preceded by a call to [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md). This command should be preceded by a call to [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md).

74
scripts/cmake/vcpkg_build_cmake.cmake
View File

@ -18,7 +18,7 @@ The target passed to the cmake build command (`cmake --build . --target <target>
be passed. be passed.
### ADD_BIN_TO_PATH ### ADD_BIN_TO_PATH
Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs. Adds the appropriate Release and Debug `bin` directories to the path during the build such that executables can run against the in-tree DLLs.
## Notes: ## Notes:
This command should be preceded by a call to [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md). This command should be preceded by a call to [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md).
@ -44,73 +44,79 @@ function(vcpkg_build_cmake)
message(FATAL_ERROR "The ${PORT} port already depends on vcpkg-cmake; using both vcpkg-cmake and vcpkg_build_cmake in the same port is unsupported.") message(FATAL_ERROR "The ${PORT} port already depends on vcpkg-cmake; using both vcpkg-cmake and vcpkg_build_cmake in the same port is unsupported.")
endif() endif()
if(NOT arg_LOGFILE_ROOT) if(NOT DEFINED arg_LOGFILE_ROOT)
set(arg_LOGFILE_ROOT "build") set(arg_LOGFILE_ROOT "build")
endif() endif()
set(PARALLEL_ARG) vcpkg_list(SET build_param)
set(NO_PARALLEL_ARG) vcpkg_list(SET parallel_param)
vcpkg_list(SET no_parallel_param)
if(Z_VCPKG_CMAKE_GENERATOR MATCHES "Ninja") if("${Z_VCPKG_CMAKE_GENERATOR}" STREQUAL "Ninja")
set(BUILD_ARGS "-v") # verbose output vcpkg_list(SET build_param "-v") # verbose output
set(PARALLEL_ARG "-j${VCPKG_CONCURRENCY}") vcpkg_list(SET parallel_param "-j${VCPKG_CONCURRENCY}")
set(NO_PARALLEL_ARG "-j1") vcpkg_list(SET no_parallel_param "-j1")
elseif(Z_VCPKG_CMAKE_GENERATOR MATCHES "Visual Studio") elseif("${Z_VCPKG_CMAKE_GENERATOR}" MATCHES "^Visual Studio")
set(BUILD_ARGS vcpkg_list(SET build_param
"/p:VCPkgLocalAppDataDisabled=true" "/p:VCPkgLocalAppDataDisabled=true"
"/p:UseIntelMKL=No" "/p:UseIntelMKL=No"
) )
set(PARALLEL_ARG "/m") vcpkg_list(SET parallel_param "/m")
elseif(Z_VCPKG_CMAKE_GENERATOR MATCHES "NMake") elseif("${Z_VCPKG_CMAKE_GENERATOR}" STREQUAL "NMake Makefiles")
# No options are currently added for nmake builds # No options are currently added for nmake builds
else() else()
message(FATAL_ERROR "Unrecognized GENERATOR setting from vcpkg_configure_cmake(). Valid generators are: Ninja, Visual Studio, and NMake Makefiles") message(FATAL_ERROR "Unrecognized GENERATOR setting from vcpkg_configure_cmake(). Valid generators are: Ninja, Visual Studio, and NMake Makefiles")
endif() endif()
vcpkg_list(SET target_param)
if(arg_TARGET) if(arg_TARGET)
set(TARGET_PARAM "--target" ${arg_TARGET}) vcpkg_list(SET target_param "--target" "${arg_TARGET}")
else()
set(TARGET_PARAM)
endif() endif()
foreach(BUILDTYPE "debug" "release") foreach(build_type IN ITEMS debug release)
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL BUILDTYPE) if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "${build_type}")
if(BUILDTYPE STREQUAL "debug") if("${build_type}" STREQUAL "debug")
set(SHORT_BUILDTYPE "dbg") set(short_build_type "dbg")
set(CONFIG "Debug") set(config "Debug")
else() else()
set(SHORT_BUILDTYPE "rel") set(short_build_type "rel")
set(CONFIG "Release") set(config "Release")
endif() endif()
message(STATUS "Building ${TARGET_TRIPLET}-${SHORT_BUILDTYPE}") message(STATUS "Building ${TARGET_TRIPLET}-${short_build_type}")
if(arg_ADD_BIN_TO_PATH) if(arg_ADD_BIN_TO_PATH)
set(_BACKUP_ENV_PATH "$ENV{PATH}") vcpkg_backup_env_variables(VARS PATH)
if(BUILDTYPE STREQUAL "debug") if("${build_type}" STREQUAL "debug")
vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin") vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin")
else() else()
vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin") vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin")
endif() endif()
endif() endif()
if (arg_DISABLE_PARALLEL) if(arg_DISABLE_PARALLEL)
vcpkg_execute_build_process( vcpkg_execute_build_process(
COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} ${NO_PARALLEL_ARG} COMMAND
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE} "${CMAKE_COMMAND}" --build . --config "${config}" ${target_param}
LOGNAME "${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}-${SHORT_BUILDTYPE}" -- ${build_param} ${no_parallel_param}
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_build_type}"
LOGNAME "${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}-${short_build_type}"
) )
else() else()
vcpkg_execute_build_process( vcpkg_execute_build_process(
COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} ${PARALLEL_ARG} COMMAND
NO_PARALLEL_COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} ${NO_PARALLEL_ARG} "${CMAKE_COMMAND}" --build . --config "${config}" ${target_param}
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE} -- ${build_param} ${parallel_param}
LOGNAME "${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}-${SHORT_BUILDTYPE}" NO_PARALLEL_COMMAND
"${CMAKE_COMMAND}" --build . --config "${config}" ${target_param}
-- ${build_param} ${no_parallel_param}
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_build_type}"
LOGNAME "${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}-${short_build_type}"
) )
endif() endif()
if(arg_ADD_BIN_TO_PATH) if(arg_ADD_BIN_TO_PATH)
set(ENV{PATH} "${_BACKUP_ENV_PATH}") vcpkg_restore_env_variables(VARS PATH)
endif() endif()
endif() endif()
endforeach() endforeach()

333
scripts/cmake/vcpkg_configure_cmake.cmake
View File

@ -82,6 +82,23 @@ This command supplies many common arguments to CMake. To see the full list, exam
* [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake) * [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake)
#]===] #]===]
function(z_vcpkg_configure_cmake_both_or_neither_set var1 var2)
if(DEFINED "${var1}" AND NOT DEFINED "${var2}")
message(FATAL_ERROR "If ${var1} is set, ${var2} must be set.")
endif()
if(NOT DEFINED "${var1}" AND DEFINED "${var2}")
message(FATAL_ERROR "If ${var2} is set, ${var1} must be set.")
endif()
endfunction()
function(z_vcpkg_configure_cmake_build_cmakecache out_var whereat build_type)
set(line "build ${whereat}/CMakeCache.txt: CreateProcess\n process = cmd /c \"cd ${whereat} &&")
foreach(arg IN LISTS "${build_type}_command")
string(APPEND line " \"${arg}\"")
endforeach()
set("${out_var}" "${${out_var}}${line}\"\n\n" PARENT_SCOPE)
endfunction()
function(vcpkg_configure_cmake) function(vcpkg_configure_cmake)
cmake_parse_arguments(PARSE_ARGV 0 arg cmake_parse_arguments(PARSE_ARGV 0 arg
"PREFER_NINJA;DISABLE_PARALLEL_CONFIGURE;NO_CHARSET_FLAG;Z_GET_CMAKE_VARS_USAGE" "PREFER_NINJA;DISABLE_PARALLEL_CONFIGURE;NO_CHARSET_FLAG;Z_GET_CMAKE_VARS_USAGE"
@ -93,16 +110,17 @@ function(vcpkg_configure_cmake)
message(FATAL_ERROR "The ${PORT} port already depends on vcpkg-cmake; using both vcpkg-cmake and vcpkg_configure_cmake in the same port is unsupported.") message(FATAL_ERROR "The ${PORT} port already depends on vcpkg-cmake; using both vcpkg-cmake and vcpkg_configure_cmake in the same port is unsupported.")
endif() endif()
if(NOT VCPKG_PLATFORM_TOOLSET) if(DEFINED arg_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "Vcpkg has been updated with VS2017 support; " message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}")
"however, vcpkg.exe must be rebuilt by re-running bootstrap-vcpkg.bat\n") endif()
if(NOT DEFINED arg_SOURCE_PATH)
message(FATAL_ERROR "SOURCE_PATH must be specified")
endif()
if(NOT DEFINED arg_LOGNAME)
set(arg_LOGNAME "config-${TARGET_TRIPLET}")
endif() endif()
if(NOT arg_LOGNAME) vcpkg_list(SET manually_specified_variables)
set(arg_LOGNAME config-${TARGET_TRIPLET})
endif()
set(manually_specified_variables "")
if(arg_Z_GET_CMAKE_VARS_USAGE) if(arg_Z_GET_CMAKE_VARS_USAGE)
set(configuring_message "Getting CMake variables for ${TARGET_TRIPLET}") set(configuring_message "Getting CMake variables for ${TARGET_TRIPLET}")
@ -110,153 +128,123 @@ function(vcpkg_configure_cmake)
set(configuring_message "Configuring ${TARGET_TRIPLET}") set(configuring_message "Configuring ${TARGET_TRIPLET}")
foreach(option IN LISTS arg_OPTIONS arg_OPTIONS_RELEASE arg_OPTIONS_DEBUG) foreach(option IN LISTS arg_OPTIONS arg_OPTIONS_RELEASE arg_OPTIONS_DEBUG)
if(option MATCHES "^-D([^:=]*)[:=]") if("${option}" MATCHES "^-D([^:=]*)[:=]")
list(APPEND manually_specified_variables "${CMAKE_MATCH_1}") vcpkg_list(APPEND manually_specified_variables "${CMAKE_MATCH_1}")
endif() endif()
endforeach() endforeach()
list(REMOVE_DUPLICATES manually_specified_variables) vcpkg_list(REMOVE_DUPLICATES manually_specified_variables)
list(REMOVE_ITEM manually_specified_variables ${arg_MAYBE_UNUSED_VARIABLES}) foreach(maybe_unused_var IN LISTS arg_MAYBE_UNUSED_VARIABLES)
vcpkg_list(REMOVE_ITEM manually_specified_variables "${maybe_unused_var}")
endforeach()
debug_message("manually specified variables: ${manually_specified_variables}") debug_message("manually specified variables: ${manually_specified_variables}")
endif() endif()
if(CMAKE_HOST_WIN32) set(ninja_can_be_used ON) # Ninja as generator
set(ninja_host ON) # Ninja as parallel configurator
if(VCPKG_HOST_IS_WINDOWS)
if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) if(DEFINED ENV{PROCESSOR_ARCHITEW6432})
set(arg_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITEW6432}) set(host_arch "$ENV{PROCESSOR_ARCHITEW6432}")
else() else()
set(arg_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITECTURE}) set(host_arch "$ENV{PROCESSOR_ARCHITECTURE}")
endif()
endif() endif()
set(NINJA_CAN_BE_USED ON) # Ninja as generator if("${host_arch}" STREQUAL "x86")
set(NINJA_HOST ON) # Ninja as parallel configurator
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
set(_TARGETTING_UWP 1)
endif()
if(arg_HOST_ARCHITECTURE STREQUAL "x86")
# Prebuilt ninja binaries are only provided for x64 hosts # Prebuilt ninja binaries are only provided for x64 hosts
set(NINJA_CAN_BE_USED OFF) set(ninja_can_be_used OFF)
set(NINJA_HOST OFF) set(ninja_host OFF)
elseif(_TARGETTING_UWP) elseif(VCPKG_TARGET_IS_UWP)
# Ninja and MSBuild have many differences when targetting UWP, so use MSBuild to maximize existing compatibility # Ninja and MSBuild have many differences when targeting UWP, so use MSBuild to maximize existing compatibility
set(NINJA_CAN_BE_USED OFF) set(ninja_can_be_used OFF)
endif()
endif() endif()
if(arg_GENERATOR) set(generator "")
set(GENERATOR ${arg_GENERATOR}) set(generator_arch "")
elseif(arg_PREFER_NINJA AND NINJA_CAN_BE_USED) if(DEFINED arg_GENERATOR)
set(GENERATOR "Ninja") set(generator "${arg_GENERATOR}")
elseif(VCPKG_CHAINLOAD_TOOLCHAIN_FILE OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT _TARGETTING_UWP)) elseif(arg_PREFER_NINJA AND ninja_can_be_used)
set(GENERATOR "Ninja") set(generator "Ninja")
elseif(VCPKG_CHAINLOAD_TOOLCHAIN_FILE OR NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW)
set(generator "Ninja")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v120")
set(GENERATOR "Visual Studio 12 2013")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v120")
set(GENERATOR "Visual Studio 12 2013 Win64")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v120")
set(GENERATOR "Visual Studio 12 2013 ARM")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v140")
set(GENERATOR "Visual Studio 14 2015")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v140")
set(GENERATOR "Visual Studio 14 2015 Win64")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v140")
set(GENERATOR "Visual Studio 14 2015 ARM")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v141")
set(GENERATOR "Visual Studio 15 2017")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v141")
set(GENERATOR "Visual Studio 15 2017 Win64")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v141")
set(GENERATOR "Visual Studio 15 2017 ARM")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v141")
set(GENERATOR "Visual Studio 15 2017")
set(ARCH "ARM64")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v142")
set(GENERATOR "Visual Studio 16 2019")
set(ARCH "Win32")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v142")
set(GENERATOR "Visual Studio 16 2019")
set(ARCH "x64")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v142")
set(GENERATOR "Visual Studio 16 2019")
set(ARCH "ARM")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v142")
set(GENERATOR "Visual Studio 16 2019")
set(ARCH "ARM64")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v143")
set(GENERATOR "Visual Studio 17 2022")
set(ARCH "Win32")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v143")
set(GENERATOR "Visual Studio 17 2022")
set(ARCH "x64")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v143")
set(GENERATOR "Visual Studio 17 2022")
set(ARCH "ARM")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v143")
set(GENERATOR "Visual Studio 17 2022")
set(ARCH "ARM64")
else() else()
if(NOT VCPKG_CMAKE_SYSTEM_NAME) if("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v120" AND NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64")
set(VCPKG_CMAKE_SYSTEM_NAME Windows) set(generator "Visual Studio 12 2013")
elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v140" AND NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64")
set(generator "Visual Studio 14 2015")
elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v141")
set(generator "Visual Studio 15 2017")
elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v142")
set(generator "Visual Studio 16 2019")
elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v143")
set(generator "Visual Studio 17 2022")
endif()
if("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x86")
set(generator_arch "Win32")
elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x64")
set(generator_arch "x64")
elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm")
set(generator_arch "ARM")
elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64")
set(generator_arch "ARM64")
endif()
if("${generator}" STREQUAL "" OR "${generator_arch}" STREQUAL "")
message(FATAL_ERROR
"Unable to determine appropriate generator for triplet ${TARGET_TRIPLET}:
platform toolset: ${VCPKG_PLATFORM_TOOLSET}
architecture : ${VCPKG_TARGET_ARCHITECTURE}")
endif() endif()
message(FATAL_ERROR "Unable to determine appropriate generator for: "
"${VCPKG_CMAKE_SYSTEM_NAME}-${VCPKG_TARGET_ARCHITECTURE}-${VCPKG_PLATFORM_TOOLSET}")
endif() endif()
# If we use Ninja, make sure it's on PATH # If we use Ninja, make sure it's on PATH
if(GENERATOR STREQUAL "Ninja" AND NOT DEFINED ENV{VCPKG_FORCE_SYSTEM_BINARIES}) if("${generator}" STREQUAL "Ninja" AND NOT DEFINED ENV{VCPKG_FORCE_SYSTEM_BINARIES})
vcpkg_find_acquire_program(NINJA) vcpkg_find_acquire_program(NINJA)
get_filename_component(NINJA_PATH ${NINJA} DIRECTORY) get_filename_component(NINJA_PATH "${NINJA}" DIRECTORY)
vcpkg_add_to_path("${NINJA_PATH}") vcpkg_add_to_path("${NINJA_PATH}")
list(APPEND arg_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}") vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}")
endif() endif()
file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) file(REMOVE_RECURSE
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
if(DEFINED VCPKG_CMAKE_SYSTEM_NAME) if(DEFINED VCPKG_CMAKE_SYSTEM_NAME)
list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}") vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}")
if(_TARGETTING_UWP AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) if(VCPKG_TARGET_IS_UWP AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION)
set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) set(VCPKG_CMAKE_SYSTEM_VERSION 10.0)
elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android" AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) elseif(VCPKG_TARGET_IS_ANDROID AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION)
set(VCPKG_CMAKE_SYSTEM_VERSION 21) set(VCPKG_CMAKE_SYSTEM_VERSION 21)
endif() endif()
endif() endif()
if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION)
list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}") vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}")
endif() endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "dynamic")
list(APPEND arg_OPTIONS -DBUILD_SHARED_LIBS=ON) vcpkg_list(APPEND arg_OPTIONS -DBUILD_SHARED_LIBS=ON)
elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") elseif("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static")
list(APPEND arg_OPTIONS -DBUILD_SHARED_LIBS=OFF) vcpkg_list(APPEND arg_OPTIONS -DBUILD_SHARED_LIBS=OFF)
else() else()
message(FATAL_ERROR message(FATAL_ERROR
"Invalid setting for VCPKG_LIBRARY_LINKAGE: \"${VCPKG_LIBRARY_LINKAGE}\". " "Invalid setting for VCPKG_LIBRARY_LINKAGE: \"${VCPKG_LIBRARY_LINKAGE}\".
"It must be \"static\" or \"dynamic\"") It must be \"static\" or \"dynamic\"")
endif() endif()
macro(check_both_vars_are_set var1 var2) z_vcpkg_configure_cmake_both_or_neither_set(VCPKG_CXX_FLAGS_DEBUG VCPKG_C_FLAGS_DEBUG)
if((NOT DEFINED ${var1} OR NOT DEFINED ${var2}) AND (DEFINED ${var1} OR DEFINED ${var2})) z_vcpkg_configure_cmake_both_or_neither_set(VCPKG_CXX_FLAGS_RELEASE VCPKG_C_FLAGS_RELEASE)
message(FATAL_ERROR "Both ${var1} and ${var2} must be set.") z_vcpkg_configure_cmake_both_or_neither_set(VCPKG_CXX_FLAGS VCPKG_C_FLAGS)
endif()
endmacro()
check_both_vars_are_set(VCPKG_CXX_FLAGS_DEBUG VCPKG_C_FLAGS_DEBUG) set(vcpkg_set_charset_flag ON)
check_both_vars_are_set(VCPKG_CXX_FLAGS_RELEASE VCPKG_C_FLAGS_RELEASE)
check_both_vars_are_set(VCPKG_CXX_FLAGS VCPKG_C_FLAGS)
set(VCPKG_SET_CHARSET_FLAG ON)
if(arg_NO_CHARSET_FLAG) if(arg_NO_CHARSET_FLAG)
set(VCPKG_SET_CHARSET_FLAG OFF) set(vcpkg_set_charset_flag OFF)
endif() endif()
if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE)
if(NOT DEFINED VCPKG_CMAKE_SYSTEM_NAME OR _TARGETTING_UWP) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake")
elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake")
@ -275,11 +263,10 @@ function(vcpkg_configure_cmake)
endif() endif()
endif() endif()
list(JOIN VCPKG_TARGET_ARCHITECTURE "\;" target_architecure_string) vcpkg_list(APPEND arg_OPTIONS
list(APPEND arg_OPTIONS
"-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}"
"-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}" "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}"
"-DVCPKG_SET_CHARSET_FLAG=${VCPKG_SET_CHARSET_FLAG}" "-DVCPKG_SET_CHARSET_FLAG=${vcpkg_set_charset_flag}"
"-DVCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}" "-DVCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}"
"-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON"
"-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON" "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON"
@ -299,118 +286,108 @@ function(vcpkg_configure_cmake)
"-DVCPKG_LINKER_FLAGS=${VCPKG_LINKER_FLAGS}" "-DVCPKG_LINKER_FLAGS=${VCPKG_LINKER_FLAGS}"
"-DVCPKG_LINKER_FLAGS_RELEASE=${VCPKG_LINKER_FLAGS_RELEASE}" "-DVCPKG_LINKER_FLAGS_RELEASE=${VCPKG_LINKER_FLAGS_RELEASE}"
"-DVCPKG_LINKER_FLAGS_DEBUG=${VCPKG_LINKER_FLAGS_DEBUG}" "-DVCPKG_LINKER_FLAGS_DEBUG=${VCPKG_LINKER_FLAGS_DEBUG}"
"-DVCPKG_TARGET_ARCHITECTURE=${target_architecure_string}" "-DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}"
"-DCMAKE_INSTALL_LIBDIR:STRING=lib" "-DCMAKE_INSTALL_LIBDIR:STRING=lib"
"-DCMAKE_INSTALL_BINDIR:STRING=bin" "-DCMAKE_INSTALL_BINDIR:STRING=bin"
"-D_VCPKG_ROOT_DIR=${VCPKG_ROOT_DIR}" "-D_VCPKG_ROOT_DIR=${VCPKG_ROOT_DIR}"
"-DZ_VCPKG_ROOT_DIR=${VCPKG_ROOT_DIR}"
"-D_VCPKG_INSTALLED_DIR=${_VCPKG_INSTALLED_DIR}" "-D_VCPKG_INSTALLED_DIR=${_VCPKG_INSTALLED_DIR}"
"-DVCPKG_MANIFEST_INSTALL=OFF" "-DVCPKG_MANIFEST_INSTALL=OFF"
) )
if(DEFINED ARCH) if(NOT "${generator_arch}" STREQUAL "")
list(APPEND arg_OPTIONS vcpkg_list(APPEND arg_OPTIONS "-A${generator_arch}")
"-A${ARCH}"
)
endif() endif()
# Sets configuration variables for macOS builds # Sets configuration variables for macOS builds
foreach(config_var INSTALL_NAME_DIR OSX_DEPLOYMENT_TARGET OSX_SYSROOT OSX_ARCHITECTURES) foreach(config_var IN ITEMS INSTALL_NAME_DIR OSX_DEPLOYMENT_TARGET OSX_SYSROOT OSX_ARCHITECTURES)
if(DEFINED VCPKG_${config_var}) if(DEFINED "VCPKG_${config_var}")
list(JOIN VCPKG_${config_var} "\;" config_var_value) vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${VCPKG_${config_var}}")
list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${config_var_value}")
endif() endif()
endforeach() endforeach()
set(rel_command vcpkg_list(SET rel_command
${CMAKE_COMMAND} ${arg_SOURCE_PATH} "${arg_OPTIONS}" "${arg_OPTIONS_RELEASE}" "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" ${arg_OPTIONS} ${arg_OPTIONS_RELEASE}
-G ${GENERATOR} -G "${generator}"
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}) "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}")
set(dbg_command vcpkg_list(SET dbg_command
${CMAKE_COMMAND} ${arg_SOURCE_PATH} "${arg_OPTIONS}" "${arg_OPTIONS_DEBUG}" "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" ${arg_OPTIONS} ${arg_OPTIONS_DEBUG}
-G ${GENERATOR} -G "${generator}"
-DCMAKE_BUILD_TYPE=Debug -DCMAKE_BUILD_TYPE=Debug
-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug) "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug")
if(NINJA_HOST AND CMAKE_HOST_WIN32 AND NOT arg_DISABLE_PARALLEL_CONFIGURE) if(ninja_host AND CMAKE_HOST_WIN32 AND NOT arg_DISABLE_PARALLEL_CONFIGURE)
list(APPEND arg_OPTIONS "-DCMAKE_DISABLE_SOURCE_CHANGES=ON") vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_DISABLE_SOURCE_CHANGES=ON")
vcpkg_find_acquire_program(NINJA) vcpkg_find_acquire_program(NINJA)
get_filename_component(NINJA_PATH ${NINJA} DIRECTORY) get_filename_component(NINJA_PATH "${NINJA}" DIRECTORY)
vcpkg_add_to_path("${NINJA_PATH}") vcpkg_add_to_path("${NINJA_PATH}")
#parallelize the configure step #parallelize the configure step
set(_contents set(ninja_configure_contents
"rule CreateProcess\n command = $process\n\n" "rule CreateProcess\n command = \$process\n\n"
) )
macro(_build_cmakecache whereat build_type) if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "release")
set(${build_type}_line "build ${whereat}/CMakeCache.txt: CreateProcess\n process = cmd /c \"cd ${whereat} &&") z_vcpkg_configure_cmake_build_cmakecache(ninja_configure_contents ".." "rel")
foreach(arg ${${build_type}_command}) endif()
set(${build_type}_line "${${build_type}_line} \"${arg}\"") if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "debug")
endforeach() z_vcpkg_configure_cmake_build_cmakecache(ninja_configure_contents "../../${TARGET_TRIPLET}-dbg" "dbg")
set(_contents "${_contents}${${build_type}_line}\"\n\n")
endmacro()
if(NOT DEFINED VCPKG_BUILD_TYPE)
_build_cmakecache(".." "rel")
_build_cmakecache("../../${TARGET_TRIPLET}-dbg" "dbg")
elseif(VCPKG_BUILD_TYPE STREQUAL "release")
_build_cmakecache(".." "rel")
elseif(VCPKG_BUILD_TYPE STREQUAL "debug")
_build_cmakecache("../../${TARGET_TRIPLET}-dbg" "dbg")
endif() endif()
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure) file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure")
file(WRITE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure/build.ninja "${_contents}") file(WRITE
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure/build.ninja"
"${ninja_configure_contents}")
message(STATUS "${configuring_message}") message(STATUS "${configuring_message}")
vcpkg_execute_required_process( vcpkg_execute_required_process(
COMMAND ninja -v COMMAND ninja -v
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure"
LOGNAME ${arg_LOGNAME} LOGNAME "${arg_LOGNAME}"
) )
list(APPEND config_logs vcpkg_list(APPEND config_logs
"${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-out.log" "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-out.log"
"${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-err.log") "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-err.log")
else() else()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "debug")
message(STATUS "${configuring_message}-dbg") message(STATUS "${configuring_message}-dbg")
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
vcpkg_execute_required_process( vcpkg_execute_required_process(
COMMAND ${dbg_command} COMMAND ${dbg_command}
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
LOGNAME ${arg_LOGNAME}-dbg LOGNAME "${arg_LOGNAME}-dbg"
) )
list(APPEND config_logs vcpkg_list(APPEND config_logs
"${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-dbg-out.log" "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-dbg-out.log"
"${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-dbg-err.log") "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-dbg-err.log")
endif() endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "release")
message(STATUS "${configuring_message}-rel") message(STATUS "${configuring_message}-rel")
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
vcpkg_execute_required_process( vcpkg_execute_required_process(
COMMAND ${rel_command} COMMAND ${rel_command}
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
LOGNAME ${arg_LOGNAME}-rel LOGNAME "${arg_LOGNAME}-rel"
) )
list(APPEND config_logs vcpkg_list(APPEND config_logs
"${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-rel-out.log" "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-rel-out.log"
"${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-rel-err.log") "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-rel-err.log")
endif() endif()
endif() endif()
# Check unused variables # Check unused variables
set(all_unused_variables) vcpkg_list(SET all_unused_variables)
foreach(config_log IN LISTS config_logs) foreach(config_log IN LISTS config_logs)
if (NOT EXISTS "${config_log}") if(NOT EXISTS "${config_log}")
continue() continue()
endif() endif()
file(READ "${config_log}" log_contents) file(READ "${config_log}" log_contents)
debug_message("Reading configure log ${config_log}...") debug_message("Reading configure log ${config_log}...")
if(NOT log_contents MATCHES "Manually-specified variables were not used by the project:\n\n(( [^\n]*\n)*)") if(NOT "${log_contents}" MATCHES "Manually-specified variables were not used by the project:\n\n(( [^\n]*\n)*)")
continue() continue()
endif() endif()
string(STRIP "${CMAKE_MATCH_1}" unused_variables) # remove leading ` ` and trailing `\n` string(STRIP "${CMAKE_MATCH_1}" unused_variables) # remove leading ` ` and trailing `\n`
@ -418,18 +395,18 @@ function(vcpkg_configure_cmake)
debug_message("unused variables: ${unused_variables}") debug_message("unused variables: ${unused_variables}")
foreach(unused_variable IN LISTS unused_variables) foreach(unused_variable IN LISTS unused_variables)
if(unused_variable IN_LIST manually_specified_variables) if("${unused_variable}" IN_LIST manually_specified_variables)
debug_message("manually specified unused variable: ${unused_variable}") debug_message("manually specified unused variable: ${unused_variable}")
list(APPEND all_unused_variables "${unused_variable}") vcpkg_list(APPEND all_unused_variables "${unused_variable}")
else() else()
debug_message("unused variable (not manually specified): ${unused_variable}") debug_message("unused variable (not manually specified): ${unused_variable}")
endif() endif()
endforeach() endforeach()
endforeach() endforeach()
if(DEFINED all_unused_variables) if(NOT "${all_unused_variables}" STREQUAL "")
list(REMOVE_DUPLICATES all_unused_variables) vcpkg_list(REMOVE_DUPLICATES all_unused_variables)
list(JOIN all_unused_variables "\n " all_unused_variables) vcpkg_list(JOIN all_unused_variables "\n " all_unused_variables)
message(WARNING "The following variables are not used in CMakeLists.txt: message(WARNING "The following variables are not used in CMakeLists.txt:
${all_unused_variables} ${all_unused_variables}
Please recheck them and remove the unnecessary options from the `vcpkg_configure_cmake` call. Please recheck them and remove the unnecessary options from the `vcpkg_configure_cmake` call.
@ -437,6 +414,6 @@ If these options should still be passed for whatever reason, please use the `MAY
endif() endif()
if(NOT arg_Z_GET_CMAKE_VARS_USAGE) if(NOT arg_Z_GET_CMAKE_VARS_USAGE)
set(Z_VCPKG_CMAKE_GENERATOR "${GENERATOR}" PARENT_SCOPE) set(Z_VCPKG_CMAKE_GENERATOR "${generator}" PARENT_SCOPE)
endif() endif()
endfunction() endfunction()

6
scripts/cmake/vcpkg_install_cmake.cmake
View File

@ -34,15 +34,15 @@ function(vcpkg_install_cmake)
message(FATAL_ERROR "vcpkg_cmake_install was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") message(FATAL_ERROR "vcpkg_cmake_install was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}")
endif() endif()
set(args) vcpkg_list(SET params)
foreach(arg IN ITEMS DISABLE_PARALLEL ADD_BIN_TO_PATH) foreach(arg IN ITEMS DISABLE_PARALLEL ADD_BIN_TO_PATH)
if(arg_${arg}) if(arg_${arg})
list(APPEND args "${arg}") vcpkg_list(APPEND params "${arg}")
endif() endif()
endforeach() endforeach()
vcpkg_build_cmake(Z_VCPKG_DISABLE_DEPRECATION MESSAGE vcpkg_build_cmake(Z_VCPKG_DISABLE_DEPRECATION MESSAGE
${args} ${params}
LOGFILE_ROOT install LOGFILE_ROOT install
TARGET install TARGET install
) )