mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 14:09:01 +08:00
9ccd693f1b
* [toolchain windows] set CMAKE_SYSTEM_NAME and CMAKE_SYSTEM_PROCESSOR In specific, I did this for the cpuinfo PR - I realized the reason that cpuinfo doesn't support arm64 windows cross compilation is because we don't set CMAKE_SYSTEM_PROCESSOR. * correctly set CMAKE_CROSSCOMPILING * start fixin libraries * more changes: - gainput: remove line - glog: remove try_run when cross compiling - windows.cmake: set CMAKE_SYSTEM_VERSION * more patches - mapnik: set BOOST_REGEX_HAS_ICU to avoid check_cxx_source_runs - orc: set HAS_PRE_1970 and HAS_POST_2038 for same - seal: change out check_cxx_source_runs for check_cxx_source_compiles * more changes * fix x86-windows * fix qpid-proton, glog * build corrade-rc * fix x64-uwp ports * forgot to _actually_ always build corrade-rc .,. * Replay #22831 * Dedupe CMAKE_SYSTEM_NAME settings. * Add quotes for corrade_rc_param Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update version DB. Co-authored-by: nicole mazzuca <mazzucan@outlook.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
--- a/src/Corrade/Utility/CMakeLists.txt
|
|
+++ b/src/Corrade/Utility/CMakeLists.txt
|
|
@@ -185,13 +185,12 @@
|
|
# corrade-rc when generating WinRT targets by setting
|
|
# set_target_properties(corrade-rc PROPERTIES VS_WINRT_COMPONENT OFF)
|
|
# Then this would be if(NOT CMAKE_CROSSCOMPILING OR CORRADE_TARGET_WINDOWS_RT).
|
|
# However, it seems like this feature never materialized, as doing this will
|
|
# result in corrade-rc that's looking for vcruntime140_app.dll in order to be
|
|
# run. Last checked: Nov 2019.
|
|
-if(NOT CMAKE_CROSSCOMPILING)
|
|
# Sources for standalone corrade-rc
|
|
set(CorradeUtilityRc_SRCS
|
|
Arguments.cpp
|
|
Debug.cpp
|
|
Directory.cpp
|
|
Configuration.cpp
|
|
@@ -235,9 +234,10 @@
|
|
if(CORRADE_TARGET_UNIX)
|
|
target_link_libraries(corrade-rc PRIVATE ${CMAKE_DL_LIBS})
|
|
endif()
|
|
set_target_properties(corrade-rc PROPERTIES FOLDER "Corrade/Utility")
|
|
install(TARGETS corrade-rc DESTINATION ${CORRADE_BINARY_INSTALL_DIR})
|
|
|
|
+if(NOT CMAKE_CROSSCOMPILING)
|
|
# Corrade::rc target alias for superprojects
|
|
add_executable(Corrade::rc ALIAS corrade-rc)
|
|
endif()
|