The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 02:57:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7598 from Neumann-A/path_separator

Browse Source 
[vcpkg] QoL: add host specific path separator to common definitions
This commit is contained in:
Robert Schumacher 2019-11-22 09:45:33 -08:00 committed by GitHub
commit 8831e8f25f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/cmake/vcpkg_add_to_path.cmake
View File

@ -29,19 +29,11 @@ function(vcpkg_add_to_path)
if(NOT "${ARGC}" STREQUAL "2") if(NOT "${ARGC}" STREQUAL "2")
message(FATAL_ERROR "Expected second argument.") message(FATAL_ERROR "Expected second argument.")
endif() endif()
if(CMAKE_HOST_WIN32) set(ENV{PATH} "${ARGV1}${VCPKG_HOST_PATH_SEPARATOR}$ENV{PATH}")
set(ENV{PATH} "${ARGV1};$ENV{PATH}")
else()
set(ENV{PATH} "${ARGV1}:$ENV{PATH}")
endif()
else() else()
if(NOT "${ARGC}" STREQUAL "1") if(NOT "${ARGC}" STREQUAL "1")
message(FATAL_ERROR "Unexpected second argument: ${ARGV1}") message(FATAL_ERROR "Unexpected second argument: ${ARGV1}")
endif() endif()
if(CMAKE_HOST_WIN32) set(ENV{PATH} "$ENV{PATH}${VCPKG_HOST_PATH_SEPARATOR}${ARGV0}")
set(ENV{PATH} "$ENV{PATH};${ARGV0}")
else()
set(ENV{PATH} "$ENV{PATH}:${ARGV0}")
endif()
endif() endif()
endfunction() endfunction()

9
scripts/cmake/vcpkg_build_cmake.cmake
View File

@ -74,15 +74,10 @@ function(vcpkg_build_cmake)
if(_bc_ADD_BIN_TO_PATH) if(_bc_ADD_BIN_TO_PATH)
set(_BACKUP_ENV_PATH "$ENV{PATH}") set(_BACKUP_ENV_PATH "$ENV{PATH}")
if(CMAKE_HOST_WIN32)
set(_PATHSEP ";")
else()
set(_PATHSEP ":")
endif()
if(BUILDTYPE STREQUAL "debug") if(BUILDTYPE STREQUAL "debug")
set(ENV{PATH} "${CURRENT_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin${_PATHSEP}$ENV{PATH}") vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin")
else() else()
set(ENV{PATH} "${CURRENT_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin${_PATHSEP}$ENV{PATH}") vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin")
endif() endif()
endif() endif()

1
scripts/cmake/vcpkg_build_qmake.cmake
View File

@ -65,6 +65,7 @@ function(vcpkg_build_qmake)
run_jom(qmake_all makefiles ${_short_name_${_buildname}}) run_jom(qmake_all makefiles ${_short_name_${_buildname}})
endif() endif()
run_jom("${_csc_${_buildname}_TARGETS}" ${_csc_BUILD_LOGNAME} ${_short_name_${_buildname}}) run_jom("${_csc_${_buildname}_TARGETS}" ${_csc_BUILD_LOGNAME} ${_short_name_${_buildname}})
unset(_BUILD_PREFIX)
endforeach() endforeach()
# Restore the original value of ENV{PATH} # Restore the original value of ENV{PATH}

8
scripts/cmake/vcpkg_common_definitions.cmake
View File

@ -5,6 +5,7 @@
## ## The following variables are available: ## ## The following variables are available:
## ```cmake ## ```cmake
## VCPKG_TARGET_IS_<target> with <target> being one of the following: WINDOWS, UWP, LINUX, OSX, ANDROID, FREEBSD. only defined if <target> ## VCPKG_TARGET_IS_<target> with <target> being one of the following: WINDOWS, UWP, LINUX, OSX, ANDROID, FREEBSD. only defined if <target>
## VCPKG_HOST_PATH_SEPARATOR Host specific path separator (USAGE: "<something>${VCPKG_HOST_PATH_SEPARATOR}<something>"; only use and pass variables with VCPKG_HOST_PATH_SEPARATOR within "")
## VCPKG_HOST_EXECUTABLE_SUFFIX executable suffix of the host ## VCPKG_HOST_EXECUTABLE_SUFFIX executable suffix of the host
## VCPKG_TARGET_EXECUTABLE_SUFFIX executable suffix of the target ## VCPKG_TARGET_EXECUTABLE_SUFFIX executable suffix of the target
## VCPKG_TARGET_STATIC_LIBRARY_PREFIX static library prefix for target (same as CMAKE_STATIC_LIBRARY_PREFIX) ## VCPKG_TARGET_STATIC_LIBRARY_PREFIX static library prefix for target (same as CMAKE_STATIC_LIBRARY_PREFIX)
@ -38,6 +39,13 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
set(VCPKG_TARGET_IS_FREEBSD 1) set(VCPKG_TARGET_IS_FREEBSD 1)
endif() endif()
#Helper variable to identify the host path separator.
if(CMAKE_HOST_WIN32)
set(VCPKG_HOST_PATH_SEPARATOR ";")
elseif(CMAKE_HOST_UNIX)
set(VCPKG_HOST_PATH_SEPARATOR ":")
endif()
#Helper variables to identify executables on host/target #Helper variables to identify executables on host/target
if(CMAKE_HOST_WIN32) if(CMAKE_HOST_WIN32)
set(VCPKG_HOST_EXECUTABLE_SUFFIX ".exe") set(VCPKG_HOST_EXECUTABLE_SUFFIX ".exe")

7
scripts/cmake/vcpkg_configure_cmake.cmake
View File

@ -72,14 +72,11 @@ function(vcpkg_configure_cmake)
endif() endif()
if(CMAKE_HOST_WIN32) if(CMAKE_HOST_WIN32)
set(_PATHSEP ";")
if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) if(DEFINED ENV{PROCESSOR_ARCHITEW6432})
set(_csc_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITEW6432}) set(_csc_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITEW6432})
else() else()
set(_csc_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITECTURE}) set(_csc_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITECTURE})
endif() endif()
else()
set(_PATHSEP ":")
endif() endif()
set(NINJA_CAN_BE_USED ON) # Ninja as generator set(NINJA_CAN_BE_USED ON) # Ninja as generator
@ -154,7 +151,7 @@ function(vcpkg_configure_cmake)
if(GENERATOR STREQUAL "Ninja") if(GENERATOR STREQUAL "Ninja")
vcpkg_find_acquire_program(NINJA) vcpkg_find_acquire_program(NINJA)
get_filename_component(NINJA_PATH ${NINJA} DIRECTORY) get_filename_component(NINJA_PATH ${NINJA} DIRECTORY)
set(ENV{PATH} "$ENV{PATH}${_PATHSEP}${NINJA_PATH}") vcpkg_add_to_path("${NINJA_PATH}")
list(APPEND _csc_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}") list(APPEND _csc_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}")
endif() endif()
@ -265,7 +262,7 @@ function(vcpkg_configure_cmake)
vcpkg_find_acquire_program(NINJA) vcpkg_find_acquire_program(NINJA)
get_filename_component(NINJA_PATH ${NINJA} DIRECTORY) get_filename_component(NINJA_PATH ${NINJA} DIRECTORY)
set(ENV{PATH} "$ENV{PATH}${_PATHSEP}${NINJA_PATH}") vcpkg_add_to_path("${NINJA_PATH}")
#parallelize the configure step #parallelize the configure step
set(_contents set(_contents