mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 05:19:01 +08:00
db807ad49f
* [clapack] FindLapack was not working for VS Generators due to extra ascii symbol "%3b" in linker dependencies which is ";" (Lists in IMPORTED_LOCATION do not work as expected) This commit is based on CMakes FindLAPACK and adds f2c to be checked * added include(SelectLibraryConfigurations) * [clapack] remove openblas patch * [openblas] add trailing _ on linux * [openblas] add find wrapper * [clapack] fix FindLapack * bump control to retrigger full CI build * [openblas] enable ninja * [mlpack] fix libary names for linkage. * bump control * Delete enable_openblas_compatibility.patch * Delete fix_underscore.patch * Update portfile.cmake * correct control version bump * fix control version bump * bump control * remove comments * remove lines in patch file * remove comment * remove unused var
46 lines
2.4 KiB
Diff
46 lines
2.4 KiB
Diff
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})
|