Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
# CLion
.idea/
cmake-build-*/

# Visual Studio 2022
.vs/
build/
lib/
.vs/
.idea/
out/
CMakeSettings.json
CMakeUserPresets.json
cmake-build-*
out/
/CMakeUserPresets.json
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.20)

project(ja2)

include(cmake/CopyUserPresetTemplate.cmake)
Comment thread
CptMoore marked this conversation as resolved.
CopyUserPresetTemplate()

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
Expand Down
44 changes: 0 additions & 44 deletions CMakePresets.json

This file was deleted.

11 changes: 11 additions & 0 deletions cmake/CopyUserPresetTemplate.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
function(CopyUserPresetTemplate)
if(
NOT DEFINED Languages AND
NOT DEFINED Applications AND
NOT EXISTS "${CMAKE_SOURCE_DIR}/CMakePresets.json" AND
NOT EXISTS "${CMAKE_SOURCE_DIR}/CMakeUserPresets.json"
)
file(COPY "${CMAKE_SOURCE_DIR}/cmake/presets/CMakeUserPresets.json" DESTINATION "${CMAKE_SOURCE_DIR}")
Comment thread
CptMoore marked this conversation as resolved.
message(FATAL_ERROR "No existing preset was found, copied a preset template to ${CMAKE_SOURCE_DIR}/CMakeUserPresets.json.")
endif()
endfunction()
44 changes: 44 additions & 0 deletions cmake/presets/CMakeUserPresets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"version": 3,
"configurePresets": [
{
"name": "__userBase",
"hidden": true,
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/${presetName}",
"cacheVariables": {
// Valid choices: ENGLISH;GERMAN;FRENCH;ITALIAN;POLISH;DUTCH;RUSSIAN;CHINESE. If empty (""), will configure all.
"Languages": "ENGLISH",
// Valid choices: JA2;JA2MAPEDITOR;JA2UB;JA2UBMAPEDITOR. If empty (""), will configure all.
"Applications": "JA2",
// For debugging: enter your desired gamedir. e.g. C:/Games/JA2
"CMAKE_RUNTIME_OUTPUT_DIRECTORY": "."
},
"architecture": {
"value": "x86",
"strategy": "external"
}
},
{
"name": "1dot13 RelWithDebInfo",
"inherits": "__userBase",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
}
},
{
"name": "1dot13 Release",
"inherits": "__userBase",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release"
}
},
{
"name": "1dot13 Debug",
"inherits": "__userBase",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
}
}
]
}