提交 ad944f60 编写于 作者: C Chris Hajas

Use correct CMAKE build option for debug builds

Previously, we used "DEBUG" (in all caps) in our CI/scripts, which isn't
canonical (https://cmake.org/cmake/help/v3.0/variable/CMAKE_BUILD_TYPE.html).
Authored-by: NChris Hajas <chajas@pivotal.io>
上级 c4eb25b8
...@@ -6,7 +6,7 @@ project(gpopt LANGUAGES CXX C) ...@@ -6,7 +6,7 @@ project(gpopt LANGUAGES CXX C)
set(CMAKE_CXX_STANDARD 98) set(CMAKE_CXX_STANDARD 98)
set(GPORCA_VERSION_MAJOR 3) set(GPORCA_VERSION_MAJOR 3)
set(GPORCA_VERSION_MINOR 92) set(GPORCA_VERSION_MINOR 92)
set(GPORCA_VERSION_PATCH 1) set(GPORCA_VERSION_PATCH 2)
set(GPORCA_VERSION_STRING "${GPORCA_VERSION_MAJOR}.${GPORCA_VERSION_MINOR}.${GPORCA_VERSION_PATCH}") set(GPORCA_VERSION_STRING "${GPORCA_VERSION_MAJOR}.${GPORCA_VERSION_MINOR}.${GPORCA_VERSION_PATCH}")
# Whenever an ABI-breaking change is made to GPORCA, this should be incremented. # Whenever an ABI-breaking change is made to GPORCA, this should be incremented.
......
...@@ -219,7 +219,7 @@ Here are a few build flavors (commands run from the ORCA checkout directory): ...@@ -219,7 +219,7 @@ Here are a few build flavors (commands run from the ORCA checkout directory):
``` ```
# debug build # debug build
cmake -GNinja -D CMAKE_BUILD_TYPE=DEBUG -H. -Bbuild.debug cmake -GNinja -D CMAKE_BUILD_TYPE=Debug -H. -Bbuild.debug
``` ```
``` ```
......
...@@ -339,7 +339,7 @@ jobs: ...@@ -339,7 +339,7 @@ jobs:
image: centos5-build image: centos5-build
file: orca_src/concourse/build_and_test.yml file: orca_src/concourse/build_and_test.yml
params: params:
BUILD_TYPE: --build_type=DEBUG BUILD_TYPE: --build_type=Debug
OUTPUT_DIR: --output_dir=build_and_test/install OUTPUT_DIR: --output_dir=build_and_test/install
SKIP_TESTS: '' SKIP_TESTS: ''
- task: package_tarball_debug - task: package_tarball_debug
...@@ -393,7 +393,7 @@ jobs: ...@@ -393,7 +393,7 @@ jobs:
image: centos6-build image: centos6-build
file: orca_src/concourse/build_and_test.yml file: orca_src/concourse/build_and_test.yml
params: params:
BUILD_TYPE: --build_type=DEBUG BUILD_TYPE: --build_type=Debug
OUTPUT_DIR: --output_dir=build_and_test/install OUTPUT_DIR: --output_dir=build_and_test/install
- task: package_tarball_debug - task: package_tarball_debug
image: centos6-build image: centos6-build
...@@ -446,7 +446,7 @@ jobs: ...@@ -446,7 +446,7 @@ jobs:
image: centos7-build image: centos7-build
file: orca_src/concourse/build_and_test.yml file: orca_src/concourse/build_and_test.yml
params: params:
BUILD_TYPE: --build_type=DEBUG BUILD_TYPE: --build_type=Debug
OUTPUT_DIR: --output_dir=build_and_test/install OUTPUT_DIR: --output_dir=build_and_test/install
- task: package_tarball_debug - task: package_tarball_debug
image: centos7-build image: centos7-build
...@@ -498,7 +498,7 @@ jobs: ...@@ -498,7 +498,7 @@ jobs:
- task: build_and_test_debug - task: build_and_test_debug
file: orca_src/concourse/build_and_test.yml file: orca_src/concourse/build_and_test.yml
params: params:
BUILD_TYPE: --build_type=DEBUG BUILD_TYPE: --build_type=Debug
OUTPUT_DIR: --output_dir=build_and_test/install OUTPUT_DIR: --output_dir=build_and_test/install
SKIP_TESTS: "" SKIP_TESTS: ""
image: ubuntu18.04-build image: ubuntu18.04-build
......
...@@ -94,7 +94,7 @@ jobs: ...@@ -94,7 +94,7 @@ jobs:
file: orca_src/concourse/build_and_test.yml file: orca_src/concourse/build_and_test.yml
image: centos5-build image: centos5-build
params: params:
BUILD_TYPE: --build_type=DEBUG BUILD_TYPE: --build_type=Debug
OUTPUT_DIR: --output_dir=build_and_test/install_debug OUTPUT_DIR: --output_dir=build_and_test/install_debug
timeout: 30m timeout: 30m
on_failure: &pr_failure on_failure: &pr_failure
......
...@@ -176,7 +176,7 @@ jobs: ...@@ -176,7 +176,7 @@ jobs:
- task: untar_build_and_test_debug - task: untar_build_and_test_debug
file: orca_main_src/concourse/untar_build_and_test.yml file: orca_main_src/concourse/untar_build_and_test.yml
params: params:
BUILD_TYPE: --build_type=DEBUG BUILD_TYPE: --build_type=Debug
OUTPUT_DIR: --output_dir=build_and_test/install OUTPUT_DIR: --output_dir=build_and_test/install
SKIP_TESTS: '' SKIP_TESTS: ''
- in_parallel: - in_parallel:
......
...@@ -6,7 +6,7 @@ import sys ...@@ -6,7 +6,7 @@ import sys
BUILD_TYPE=os.environ['BUILD_TYPE'] BUILD_TYPE=os.environ['BUILD_TYPE']
OUTPUT_DIR=os.environ['OUTPUT_DIR'] OUTPUT_DIR=os.environ['OUTPUT_DIR']
SKIP_TESTS=os.environ['SKIP_TESTS'] SKIP_TESTS=os.environ['SKIP_TESTS']
if 'DEBUG' in BUILD_TYPE: if 'Debug' in BUILD_TYPE:
path_identifier = 'debug' path_identifier = 'debug'
else: else:
path_identifier = 'release' path_identifier = 'release'
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册