From 7a0ecea108c41c85af1ce8e3f4a98089bff9aa86 Mon Sep 17 00:00:00 2001 From: Aki Date: Sat, 2 Oct 2021 00:22:30 +0200 Subject: Increased control over win sdk paths --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 1387ab6..e4ddfcb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.20) project(Starshatter) -set(WINDOWSSDK_LIBPATH "C:/Program Files (x86)/Windows Kits/10/Lib/10.0.19041.0/um/x86" CACHE FILEPATH "Path to Windows SDK libraries") -set(WINDOWSSDK_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um" CACHE FILEPATH "Path to Windows SDK header files") +set(WINDOWSSDK_LIBPATH "C:/Program Files (x86)/Windows Kits/10/Lib/10.0.19041.0" CACHE FILEPATH "Path to a versioned lib directory of selected Windows SDK") +set(WINDOWSSDK_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0" CACHE FILEPATH "Path to a versioned include directory of selected Windows SDK") add_subdirectory(Datafile) # /Doc contains various documentation and pre-generated Doxygen docs. add_subdirectory(FoundationEx) -- cgit v1.1 From e9c3d5411eac83a9263fe911d9e946b17c1e966e Mon Sep 17 00:00:00 2001 From: Aki Date: Sat, 2 Oct 2021 20:44:33 +0200 Subject: Enabled C++11 standard with extensions --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index e4ddfcb..286f0ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,6 @@ cmake_minimum_required(VERSION 3.20) +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_EXTENSIONS Yes) project(Starshatter) set(WINDOWSSDK_LIBPATH "C:/Program Files (x86)/Windows Kits/10/Lib/10.0.19041.0" CACHE FILEPATH "Path to a versioned lib directory of selected Windows SDK") set(WINDOWSSDK_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0" CACHE FILEPATH "Path to a versioned include directory of selected Windows SDK") -- cgit v1.1 From 2af3e7b70b39b18c87883ccb24eb077a96338151 Mon Sep 17 00:00:00 2001 From: Aki Date: Sat, 2 Oct 2021 23:17:40 +0200 Subject: Separated out msvc cmake configuration --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 286f0ea..b1cb04b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,10 @@ cmake_minimum_required(VERSION 3.20) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_EXTENSIONS Yes) project(Starshatter) -set(WINDOWSSDK_LIBPATH "C:/Program Files (x86)/Windows Kits/10/Lib/10.0.19041.0" CACHE FILEPATH "Path to a versioned lib directory of selected Windows SDK") -set(WINDOWSSDK_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0" CACHE FILEPATH "Path to a versioned include directory of selected Windows SDK") +if(MSVC) + set(WINDOWSSDK_LIBPATH "C:/Program Files (x86)/Windows Kits/10/Lib/10.0.19041.0" CACHE FILEPATH "Path to a versioned lib directory of selected Windows SDK") + set(WINDOWSSDK_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0" CACHE FILEPATH "Path to a versioned include directory of selected Windows SDK") +endif() add_subdirectory(Datafile) # /Doc contains various documentation and pre-generated Doxygen docs. add_subdirectory(FoundationEx) -- cgit v1.1