3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-29 11:41:36 +08:00
Code Issues Projects Releases Wiki Activity

[openssl-unix] Fix for issue #4001

Browse Source 
[vcpkg_configure_cmake] Use the correct path separators for the current platform instead of assuming ;
This commit is contained in:
Robert Schumacher 2018-08-08 10:51:33 -07:00
parent ac346d9366
commit d614e3e887
6 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/openssl-unix/CMakeLists.txt
View File

@ -47,7 +47,11 @@ endif()
string(REGEX REPLACE "^ " "" CFLAGS "${CFLAGS}") string(REGEX REPLACE "^ " "" CFLAGS "${CFLAGS}")
if(CMAKE_HOST_WIN32)
file(TO_NATIVE_PATH ENV_PATH "${COMPILER_ROOT};$ENV{PATH}") file(TO_NATIVE_PATH ENV_PATH "${COMPILER_ROOT};$ENV{PATH}")
else()
file(TO_NATIVE_PATH ENV_PATH "${COMPILER_ROOT}:$ENV{PATH}")
endif()
set(ENV{ANDROID_DEV} "${CMAKE_SYSROOT}/usr") set(ENV{ANDROID_DEV} "${CMAKE_SYSROOT}/usr")
set(ENV{CC} "${CMAKE_C_COMPILER}") set(ENV{CC} "${CMAKE_C_COMPILER}")

2
ports/openssl-unix/CONTROL
View File

@ -1,3 +1,3 @@
Source: openssl-unix Source: openssl-unix
Version: 1.0.2o Version: 1.0.2o-1
Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library. Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.

4
scripts/cmake/vcpkg_acquire_msys.cmake
View File

@ -39,6 +39,10 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT)
set(TOOLPATH ${DOWNLOADS}/tools/msys2) set(TOOLPATH ${DOWNLOADS}/tools/msys2)
cmake_parse_arguments(_am "" "" "PACKAGES" ${ARGN}) cmake_parse_arguments(_am "" "" "PACKAGES" ${ARGN})
if(NOT CMAKE_HOST_WIN32)
message(FATAL_ERROR "vcpkg_acquire_msys() can only be used on Windows hosts")
endif()
# detect host architecture # detect host architecture
if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) if(DEFINED ENV{PROCESSOR_ARCHITEW6432})
set(_vam_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITEW6432}) set(_vam_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITEW6432})

11
scripts/cmake/vcpkg_build_cmake.cmake
View File

@ -80,10 +80,15 @@ 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(BUILDTYPE STREQUAL "debug") if(CMAKE_HOST_WIN32)
set(ENV{PATH} "${CURRENT_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin;$ENV{PATH}") set(_PATHSEP ";")
else() else()
set(ENV{PATH} "${CURRENT_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin;$ENV{PATH}") set(_PATHSEP ":")
endif()
if(BUILDTYPE STREQUAL "debug")
set(ENV{PATH} "${CURRENT_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin${_PATHSEP}$ENV{PATH}")
else()
set(ENV{PATH} "${CURRENT_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin${_PATHSEP}$ENV{PATH}")
endif() endif()
endif() endif()
execute_process( execute_process(

10
scripts/cmake/vcpkg_configure_cmake.cmake
View File

@ -62,6 +62,12 @@ function(vcpkg_configure_cmake)
set(_csc_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITECTURE}) set(_csc_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITECTURE})
endif() endif()
if(CMAKE_HOST_WIN32)
set(_PATHSEP ";")
else()
set(_PATHSEP ":")
endif()
set(NINJA_CAN_BE_USED ON) # Ninja as generator set(NINJA_CAN_BE_USED ON) # Ninja as generator
set(NINJA_HOST ON) # Ninja as parallel configurator set(NINJA_HOST ON) # Ninja as parallel configurator
if(_csc_HOST_ARCHITECTURE STREQUAL "x86") if(_csc_HOST_ARCHITECTURE STREQUAL "x86")
@ -114,7 +120,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};${NINJA_PATH}") set(ENV{PATH} "$ENV{PATH}${_PATHSEP}${NINJA_PATH}")
list(APPEND _csc_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}") list(APPEND _csc_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}")
endif() endif()
@ -210,7 +216,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};${NINJA_PATH}") set(ENV{PATH} "$ENV{PATH}${_PATHSEP}${NINJA_PATH}")
#parallelize the configure step #parallelize the configure step
set(_contents set(_contents

7
scripts/cmake/vcpkg_configure_meson.cmake
View File

@ -39,7 +39,12 @@ function(vcpkg_configure_meson)
vcpkg_find_acquire_program(MESON) vcpkg_find_acquire_program(MESON)
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};${NINJA_PATH}") if(CMAKE_HOST_WIN32)
set(_PATHSEP ";")
else()
set(_PATHSEP ":")
endif()
set(ENV{PATH} "$ENV{PATH}${_PATHSEP}${NINJA_PATH}")
# configure release # configure release
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")