From 9ad87ba79b412a7e6372b2b750c781a7e7016fc4 Mon Sep 17 00:00:00 2001 From: Nicole O'Connor Date: Sat, 25 Jan 2025 17:42:48 -0800 Subject: [PATCH] build system spruce-up --- CMakeLists.txt | 2 +- cmake/Cog.cmake | 4 ++-- cmake/Platform.cmake | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f8d387c..dfae099 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.7.2) +cmake_minimum_required(VERSION 3.27.2) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) include(Colours) include(Platform) diff --git a/cmake/Cog.cmake b/cmake/Cog.cmake index 702da32..ae71ff8 100644 --- a/cmake/Cog.cmake +++ b/cmake/Cog.cmake @@ -1,4 +1,4 @@ -find_package(PythonInterp) +find_package(Python3 COMPONENTS Interpreter) find_package(PythonModule) find_python_module(cogapp REQUIRED) @@ -31,7 +31,7 @@ macro(cog_target) set(thisfile "${CMAKE_CURRENT_BINARY_DIR}/${outfile}") add_custom_command(OUTPUT "${thisfile}" PRE_BUILD - COMMAND ${PYTHON_EXECUTABLE} -m cogapp -d -o "${thisfile}" "${cogfile}" + COMMAND ${Python3_EXECUTABLE} -m cogapp -d -o "${thisfile}" "${cogfile}" DEPENDS ${cogfile} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMENT "Greasing the cog for ${BoldCyan}${outfile}${ColourReset}") diff --git a/cmake/Platform.cmake b/cmake/Platform.cmake index 3bd3ca7..b0ce9df 100644 --- a/cmake/Platform.cmake +++ b/cmake/Platform.cmake @@ -1,4 +1,4 @@ -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(PLATFORM_FOREIGN_ENV FALSE)