mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 12:49:44 +08:00
e95a7a8dc0
* [vcpkg] allow to use semicolons in COMMAND argument * [llvm] update to 11.0.0 * [vcpkg] use latest version * [vcpkg] allow to use semicolons in OPTIONS * fix vcpkg_fixup_cmake_targets * [llvm] fix more install paths, add /bigobj option, fix up CMake targets * Apply suggestions from code review * [llvm] fix clang, flang, lld, mlir and polly CMake targets * [llvm] remove empty include directory /include/flang/Config * [llvm] Flang requires C++17 * [llvm] add /Zc:__cplusplus * [llvm] remove empty include directory include/clang-tidy/plugin * [llvm] try to fix ClangConfig.cmake, LLVMConfig.cmake, LLDConfig.cmake etc. with patch * [llvm] set tools install dir to tools/llvm * [aws-sdk-cpp] fix build after changes in vcpkg_configure_cmake.cmake * [llvm] disable Flang and OpenMP on Windows Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
23 lines
1.1 KiB
Diff
23 lines
1.1 KiB
Diff
diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt
|
|
index 81275c0483d..61468e048ec 100644
|
|
--- a/openmp/runtime/src/CMakeLists.txt
|
|
+++ b/openmp/runtime/src/CMakeLists.txt
|
|
@@ -136,7 +136,7 @@ libomp_get_ldflags(LIBOMP_CONFIGURED_LDFLAGS)
|
|
add_library(omp ${LIBOMP_LIBRARY_KIND} ${LIBOMP_SOURCE_FILES})
|
|
|
|
set_target_properties(omp PROPERTIES
|
|
- PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_LIB_FILE}"
|
|
+ PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_LIB_FILE}" DEBUG_POSTFIX ""
|
|
LINK_FLAGS "${LIBOMP_CONFIGURED_LDFLAGS}"
|
|
LINKER_LANGUAGE ${LIBOMP_LINKER_LANGUAGE}
|
|
)
|
|
@@ -215,7 +215,7 @@ if(WIN32)
|
|
# Create new import library that is just the previously created one + kmp_import.cpp
|
|
add_library(ompimp STATIC ${LIBOMP_GENERATED_IMP_LIB} kmp_import.cpp)
|
|
set_target_properties(ompimp PROPERTIES
|
|
- PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_IMP_LIB_FILE}"
|
|
+ PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_IMP_LIB_FILE}" DEBUG_POSTFIX ""
|
|
LINKER_LANGUAGE C
|
|
)
|
|
add_dependencies(ompimp omp) # ensure generated import library is created first
|