mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-25 10:57:56 +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>
48 lines
1.4 KiB
Diff
48 lines
1.4 KiB
Diff
set(XINPUT, "xinput") sets the variable "XINPUT," to "xinput",
|
|
so this variable is never used anyways
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index a443b66..61ff7b8 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -9,11 +9,11 @@ option(GAINPUT_TESTS "Build Tests for Gainput" ON)
|
|
option(GAINPUT_BUILD_SHARED "BUILD_SHARED" ON)
|
|
option(GAINPUT_BUILD_STATIC "BUILD_STATIC" ON)
|
|
|
|
-if(!WIN32)
|
|
+if(NOT WIN32)
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra")
|
|
else()
|
|
set(XINPUT "Xinput9_1_0")
|
|
- if ( ${CMAKE_SYSTEM_VERSION} LESS 6.1 )
|
|
+ if ( 0 )
|
|
set(XINPUT, "xinput")
|
|
endif()
|
|
endif()
|
|
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
|
|
index cb7232f..a6ae3d9 100644
|
|
--- a/lib/CMakeLists.txt
|
|
+++ b/lib/CMakeLists.txt
|
|
@@ -55,15 +55,21 @@ elseif(APPLE)
|
|
find_library(FOUNDATION Foundation)
|
|
find_library(IOKIT IOKit)
|
|
find_library(GAME_CONTROLLER GameController)
|
|
+ if (GAINPUT_BUILD_SHARED)
|
|
target_link_libraries(gainput ${FOUNDATION} ${IOKIT} ${GAME_CONTROLLER})
|
|
+ endif()
|
|
if(IOS)
|
|
find_library(UIKIT UIKit)
|
|
find_library(COREMOTION CoreMotion)
|
|
find_library(QUARTZCORE QuartzCore)
|
|
+ if (GAINPUT_BUILD_SHARED)
|
|
target_link_libraries(gainput ${UIKIT} ${COREMOTION})
|
|
+ endif()
|
|
else()
|
|
find_library(APPKIT AppKit)
|
|
+ if (GAINPUT_BUILD_SHARED)
|
|
target_link_libraries(gainput ${APPKIT})
|
|
+ endif()
|
|
endif()
|
|
endif()
|
|
|