From 90476c3a3e0ef75edbff77c3f43ba196c4799414 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Thu, 16 Apr 2020 10:25:48 +0200 Subject: [PATCH 1/3] CMakeLists: Change minimum CMake version from 3.12 to 3.10.2 Signed-off-by: Gabriel Ravier --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 06876693..e77ac5af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.12) +cmake_minimum_required(VERSION 3.10.2) ############# From 4b10fc28b4ed90de163fed9358cf27f8027433de Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Fri, 17 Apr 2020 12:22:36 +0200 Subject: [PATCH 2/3] CMakeLists: Add CMake 3.5.1 support Signed-off-by: Gabriel Ravier --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e77ac5af..4e30f527 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10.2) +cmake_minimum_required(VERSION 3.5.1) ############# @@ -248,7 +248,7 @@ set_target_properties(CSE2 PROPERTIES target_link_libraries(CSE2 PRIVATE ddraw dsound version shlwapi imm32 winmm dxguid gdi32) # Newer MSVC is missing `dinput.lib` -if(MSVC AND MSVC_VERSION GREATER_EQUAL 1500) +if(MSVC AND NOT (MSVC_VERSION LESS 1500)):wq target_link_libraries(CSE2 PRIVATE dinput8) else() target_link_libraries(CSE2 PRIVATE dinput) From e05fef85fa882bf829a815175722003380f090b6 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Fri, 17 Apr 2020 12:22:59 +0200 Subject: [PATCH 3/3] CMakeLists: Forgot I wasn't in Vim Signed-off-by: Gabriel Ravier --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e30f527..1993a927 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -248,7 +248,7 @@ set_target_properties(CSE2 PROPERTIES target_link_libraries(CSE2 PRIVATE ddraw dsound version shlwapi imm32 winmm dxguid gdi32) # Newer MSVC is missing `dinput.lib` -if(MSVC AND NOT (MSVC_VERSION LESS 1500)):wq +if(MSVC AND NOT (MSVC_VERSION LESS 1500)) target_link_libraries(CSE2 PRIVATE dinput8) else() target_link_libraries(CSE2 PRIVATE dinput)