From bf18bb8161964d77af681cc3dfa1d9456486e0ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Tue, 15 Oct 2019 23:14:00 +0200 Subject: [PATCH] Fixup MSVC CMake targets (#10100) --- CMakeLists.txt | 6 ++++-- src/openrct2/CMakeLists.txt | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1723ee56f5..ea4bdfd822 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -181,8 +181,10 @@ if (MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_SCL_SECURE_NO_WARNINGS) - add_definitions(-D__SSE4_1__) - add_definitions(-D__AVX2__) + if ((CMAKE_VS_PLATFORM_NAME STREQUAL "Win32") OR (CMAKE_VS_PLATFORM_NAME STREQUAL "x64")) + add_definitions(-D__SSE4_1__) + add_definitions(-D__AVX2__) + endif () add_definitions(-DNOMINMAX) else () ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_NULL_DEREFERENCE -Wnull-dereference) diff --git a/src/openrct2/CMakeLists.txt b/src/openrct2/CMakeLists.txt index 29831bc446..61be3d13c2 100644 --- a/src/openrct2/CMakeLists.txt +++ b/src/openrct2/CMakeLists.txt @@ -85,7 +85,8 @@ endif () # Third party libraries if (MSVC) - find_package(jansson 2.5 REQUIRED) + find_package(jansson CONFIG REQUIRED) + set(JANSSON_LIBRARIES "jansson::jansson") find_package(png 1.6 REQUIRED) find_package(zlib REQUIRED)