Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[openblas]Fix white-space-path configure bug. (#5741)

This commit is contained in:
JackBoosY 2019-03-26 05:32:28 +08:00 committed by Phil Christensen
parent d7ef001128
commit 0394ade3a9
3 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/openblas/CONTROL
View File

@ -1,3 +1,3 @@
Source: openblas
Version: 0.3.5
Version: 0.3.5-1
Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.

45
ports/openblas/fix-space-path.patch Normal file
View File

@ -0,0 +1,45 @@
diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake
index fc66eb0..ffaffcf 100644
--- a/cmake/prebuild.cmake
+++ b/cmake/prebuild.cmake
@@ -296,14 +296,14 @@ else(NOT CMAKE_CROSSCOMPILING)
set(GETARCH_DIR "${PROJECT_BINARY_DIR}/getarch_build")
set(GETARCH_BIN "getarch${CMAKE_EXECUTABLE_SUFFIX}")
- file(MAKE_DIRECTORY ${GETARCH_DIR})
- configure_file(${TARGET_CONF_TEMP} ${GETARCH_DIR}/${TARGET_CONF} COPYONLY)
+ file(MAKE_DIRECTORY "${GETARCH_DIR}")
+ configure_file(${TARGET_CONF_TEMP} "${GETARCH_DIR}/${TARGET_CONF}" COPYONLY)
if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
- try_compile(GETARCH_RESULT ${GETARCH_DIR}
+ try_compile(GETARCH_RESULT "${GETARCH_DIR}"
SOURCES ${GETARCH_SRC}
- COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I${GETARCH_DIR} -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}"
+ COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I"${GETARCH_DIR}" -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}"
OUTPUT_VARIABLE GETARCH_LOG
- COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH_BIN}
+ COPY_FILE "${PROJECT_BINARY_DIR}/${GETARCH_BIN}"
)
if (NOT ${GETARCH_RESULT})
@@ -324,14 +324,14 @@ execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIA
set(GETARCH2_DIR "${PROJECT_BINARY_DIR}/getarch2_build")
set(GETARCH2_BIN "getarch_2nd${CMAKE_EXECUTABLE_SUFFIX}")
- file(MAKE_DIRECTORY ${GETARCH2_DIR})
- configure_file(${TARGET_CONF_TEMP} ${GETARCH2_DIR}/${TARGET_CONF} COPYONLY)
+ file(MAKE_DIRECTORY "${GETARCH2_DIR}")
+ configure_file(${TARGET_CONF_TEMP} "${GETARCH2_DIR}/${TARGET_CONF}" COPYONLY)
if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
- try_compile(GETARCH2_RESULT ${GETARCH2_DIR}
- SOURCES ${PROJECT_SOURCE_DIR}/getarch_2nd.c
- COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} ${GETARCH2_FLAGS} -I${GETARCH2_DIR} -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}"
+ try_compile(GETARCH2_RESULT "${GETARCH2_DIR}"
+ SOURCES "${PROJECT_SOURCE_DIR}/getarch_2nd.c"
+ COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} ${GETARCH2_FLAGS} -I"${GETARCH2_DIR}" -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}"
OUTPUT_VARIABLE GETARCH2_LOG
- COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH2_BIN}
+ COPY_FILE "${PROJECT_BINARY_DIR}/${GETARCH2_BIN}"
)
if (NOT ${GETARCH2_RESULT})

8
ports/openblas/portfile.cmake
View File

@ -27,11 +27,9 @@ vcpkg_from_github(
REF v0.3.5
SHA512 91b3074eb922453bf843158b4281cde65db9e8bbdd7590e75e9e6cdcb486157f7973f2936f327bb3eb4f1702ce0ba51ae6729d8d4baf2d986c50771e8f696df0
HEAD_REF develop
)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES "${CMAKE_CURRENT_LIST_DIR}/uwp.patch"
PATCHES
uwp.patch
fix-space-path.patch
)
find_program(GIT NAMES git git.cmd)