diff --git a/.gitignore b/.gitignore index 9fb68704..f3adeaf7 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,10 @@ parallel_build.o* log.* CMakeUserPresets.json +# Ignore possible symlinked directories +build-* +install-* + *.swp *.swo .DS_Store diff --git a/CMakePresets.json b/CMakePresets.json index 77d1727c..60c99f0d 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -1,22 +1,14 @@ { - "version": 3, + "version": 7, "cmakeMinimumRequired": { "major": 3, - "minor": 21, + "minor": 27, "patch": 0 }, + "include": [ + "presets/CMake$penv{CMAKE_PRESET_NAME}Presets.json" + ], "configurePresets": [ - { - "name": "base-configure", - "hidden": true, - "displayName": "Base Configure Settings", - "description": "Sets build and install directories", - "binaryDir": "${sourceDir}/build-${presetName}", - "cacheVariables": { - "BASEDIR": "$env{BASEDIR}", - "CMAKE_INSTALL_PREFIX": "${sourceDir}/install-${presetName}" - } - }, { "name": "base-gnu", "hidden": true, diff --git a/presets/CMakeDefaultPresets.json b/presets/CMakeDefaultPresets.json new file mode 100644 index 00000000..3dbaf9e7 --- /dev/null +++ b/presets/CMakeDefaultPresets.json @@ -0,0 +1,13 @@ +{ + "configurePresets": [ + { + "name": "base-configure", + "hidden": true, + "displayName": "Base Configure Settings", + "description": "Sets build and install directories", + "binaryDir": "${sourceDir}/build-${presetName}", + "installDir": "${sourceDir}/install-${presetName}" + } + ], + "version": 7 +} diff --git a/presets/CMakeNCCSPresets.json b/presets/CMakeNCCSPresets.json new file mode 100644 index 00000000..4902c9b2 --- /dev/null +++ b/presets/CMakeNCCSPresets.json @@ -0,0 +1,13 @@ +{ + "configurePresets": [ + { + "name": "base-configure", + "hidden": true, + "displayName": "Base Configure Settings", + "description": "Sets build and install directories", + "binaryDir": "$penv{CMAKE_BUILD_LOCATION}/${sourceDirName}/build-${presetName}", + "installDir": "$penv{CMAKE_INSTALL_LOCATION}/${sourceDirName}/install-${presetName}" + } + ], + "version": 7 +}