This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 0995360884 CMake: Make binaryDir prefix consistent (#10665)
0995360884 is described below
commit 09953608848b75b8fd6763631d54b663949cafea
Author: Masaori Koshiba <[email protected]>
AuthorDate: Fri Nov 10 02:00:57 2023 +0900
CMake: Make binaryDir prefix consistent (#10665)
---
.gitignore | 2 +-
CMakePresets.json | 4 ++--
README.md | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index 7db84a3904..1326b7b8c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,7 +47,7 @@ m4/ltversion.m4
m4/lt~obsolete.m4
# common directory name for out-of-tree CMake builds
-build
+build*
Makefile
Makefile-pl
diff --git a/CMakePresets.json b/CMakePresets.json
index 9bf85a738b..18bd69b01d 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -65,7 +65,7 @@
"displayName": "development",
"description": "Development Presets",
"inherits": ["default"],
- "binaryDir": "${sourceDir}/cmake-build-${presetName}",
+ "binaryDir": "${sourceDir}/build-${presetName}",
"generator": "Ninja",
"cacheVariables": {
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
@@ -99,7 +99,7 @@
"displayName": "CI defaults",
"description": "Defaults for CI Pipeline builds",
"generator": "Ninja",
- "binaryDir": "${sourceDir}/cmake-ci",
+ "binaryDir": "${sourceDir}/build-ci",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_COMPILE_WARNING_AS_ERROR": "ON",
diff --git a/README.md b/README.md
index 8c5ec6bd68..bf457321eb 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ Here is an example user preset:
"name": "mydev",
"displayName": "my development",
"description": "My Development Presets",
- "binaryDir": "${sourceDir}/cmake-build-dev-clang",
+ "binaryDir": "${sourceDir}/build-dev-clang",
"inherits": ["clang", "dev"],
"cacheVariables": {
"CMAKE_INSTALL_PREFIX": "/opt/ats-cmake",
