mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-15 12:37:59 +08:00
[openblas] Move whitespace fixes to the whistespace.patch
This commit is contained in:
parent
596c17b0db
commit
b7251606f0
@ -22,40 +22,3 @@ index a379f549..f95a872b 100644
|
|||||||
|
|
||||||
# TODO: Why is the config saved here? Is this necessary with CMake?
|
# TODO: Why is the config saved here? Is this necessary with CMake?
|
||||||
#Save the config files for installation
|
#Save the config files for installation
|
||||||
diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake
|
|
||||||
index a7f98bfb..02ab7080 100644
|
|
||||||
--- a/cmake/prebuild.cmake
|
|
||||||
+++ b/cmake/prebuild.cmake
|
|
||||||
@@ -37,6 +37,10 @@
|
|
||||||
|
|
||||||
# CPUIDEMU = ../../cpuid/table.o
|
|
||||||
|
|
||||||
+if (NOT DEFINED BLASHELPER_BINARY_DIR)
|
|
||||||
+ set(BLASHELPER_BINARY_DIR "${PROJECT_BINARY_DIR}")
|
|
||||||
+endif ()
|
|
||||||
+
|
|
||||||
if (DEFINED CPUIDEMU)
|
|
||||||
set(EXFLAGS "-DCPUIDEMU -DVENDOR=99")
|
|
||||||
endif ()
|
|
||||||
@@ -95,8 +99,8 @@ endif ()
|
|
||||||
message(STATUS "Running getarch")
|
|
||||||
|
|
||||||
# use the cmake binary w/ the -E param to run a shell command in a cross-platform way
|
|
||||||
-execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH_BIN} 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT)
|
|
||||||
-execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH_BIN} 1 OUTPUT_VARIABLE GETARCH_CONF_OUT)
|
|
||||||
+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH_BIN} 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT)
|
|
||||||
+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH_BIN} 1 OUTPUT_VARIABLE GETARCH_CONF_OUT)
|
|
||||||
|
|
||||||
message(STATUS "GETARCH results:\n${GETARCH_MAKE_OUT}")
|
|
||||||
|
|
||||||
@@ -121,8 +125,8 @@ if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
# use the cmake binary w/ the -E param to run a shell command in a cross-platform way
|
|
||||||
-execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT)
|
|
||||||
-execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT)
|
|
||||||
+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN} 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT)
|
|
||||||
+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN} 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT)
|
|
||||||
|
|
||||||
# append config data from getarch_2nd to the TARGET file and read in CMake vars
|
|
||||||
file(APPEND ${TARGET_CONF} ${GETARCH2_CONF_OUT})
|
|
||||||
|
@ -2,6 +2,17 @@ diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake
|
|||||||
index 02ab708..b51bd0b 100644
|
index 02ab708..b51bd0b 100644
|
||||||
--- a/cmake/prebuild.cmake
|
--- a/cmake/prebuild.cmake
|
||||||
+++ b/cmake/prebuild.cmake
|
+++ b/cmake/prebuild.cmake
|
||||||
|
@@ -37,6 +37,10 @@
|
||||||
|
|
||||||
|
# CPUIDEMU = ../../cpuid/table.o
|
||||||
|
|
||||||
|
+if (NOT DEFINED BLASHELPER_BINARY_DIR)
|
||||||
|
+ set(BLASHELPER_BINARY_DIR "${PROJECT_BINARY_DIR}")
|
||||||
|
+endif ()
|
||||||
|
+
|
||||||
|
if (DEFINED CPUIDEMU)
|
||||||
|
set(EXFLAGS "-DCPUIDEMU -DVENDOR=99")
|
||||||
|
endif ()
|
||||||
@@ -87,7 +87,7 @@ file(MAKE_DIRECTORY ${GETARCH_DIR})
|
@@ -87,7 +87,7 @@ file(MAKE_DIRECTORY ${GETARCH_DIR})
|
||||||
if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
|
if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
|
||||||
try_compile(GETARCH_RESULT ${GETARCH_DIR}
|
try_compile(GETARCH_RESULT ${GETARCH_DIR}
|
||||||
@ -11,6 +22,17 @@ index 02ab708..b51bd0b 100644
|
|||||||
OUTPUT_VARIABLE GETARCH_LOG
|
OUTPUT_VARIABLE GETARCH_LOG
|
||||||
COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH_BIN}
|
COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH_BIN}
|
||||||
)
|
)
|
||||||
|
@@ -95,8 +99,8 @@ endif ()
|
||||||
|
message(STATUS "Running getarch")
|
||||||
|
|
||||||
|
# use the cmake binary w/ the -E param to run a shell command in a cross-platform way
|
||||||
|
-execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH_BIN} 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT)
|
||||||
|
-execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH_BIN} 1 OUTPUT_VARIABLE GETARCH_CONF_OUT)
|
||||||
|
+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH_BIN} 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT)
|
||||||
|
+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH_BIN} 1 OUTPUT_VARIABLE GETARCH_CONF_OUT)
|
||||||
|
|
||||||
|
message(STATUS "GETARCH results:\n${GETARCH_MAKE_OUT}")
|
||||||
|
|
||||||
@@ -114,7 +114,7 @@ file(MAKE_DIRECTORY ${GETARCH2_DIR})
|
@@ -114,7 +114,7 @@ file(MAKE_DIRECTORY ${GETARCH2_DIR})
|
||||||
if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
|
if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
|
||||||
try_compile(GETARCH2_RESULT ${GETARCH2_DIR}
|
try_compile(GETARCH2_RESULT ${GETARCH2_DIR}
|
||||||
@ -20,6 +42,17 @@ index 02ab708..b51bd0b 100644
|
|||||||
OUTPUT_VARIABLE GETARCH2_LOG
|
OUTPUT_VARIABLE GETARCH2_LOG
|
||||||
COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH2_BIN}
|
COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH2_BIN}
|
||||||
)
|
)
|
||||||
|
@@ -121,8 +125,8 @@ if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
# use the cmake binary w/ the -E param to run a shell command in a cross-platform way
|
||||||
|
-execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT)
|
||||||
|
-execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT)
|
||||||
|
+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN} 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT)
|
||||||
|
+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN} 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT)
|
||||||
|
|
||||||
|
# append config data from getarch_2nd to the TARGET file and read in CMake vars
|
||||||
|
file(APPEND ${TARGET_CONF} ${GETARCH2_CONF_OUT})
|
||||||
@@ -141,7 +141,7 @@ file(MAKE_DIRECTORY ${GEN_CONFIG_H_DIR})
|
@@ -141,7 +141,7 @@ file(MAKE_DIRECTORY ${GEN_CONFIG_H_DIR})
|
||||||
if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
|
if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
|
||||||
try_compile(GEN_CONFIG_H_RESULT ${GEN_CONFIG_H_DIR}
|
try_compile(GEN_CONFIG_H_RESULT ${GEN_CONFIG_H_DIR}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user