Skip to content

Commit

Permalink
[CI] Misc build scripts cleanup (open-telemetry#2232)
Browse files Browse the repository at this point in the history
  • Loading branch information
marcalff committed Jul 12, 2023
1 parent b3d547c commit bc23e6a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
6 changes: 0 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,6 @@ set(OTELCPP_PROTO_PATH
CACHE PATH "Path to opentelemetry-proto")

if(WIN32)
if(BUILD_TESTING)
if(MSVC)
# Warning as error: warning STL4036: <ciso646> is removed in C++20
add_compile_options(/wd4996)
endif()
endif()
option(WITH_ETW "Whether to include the ETW Exporter in the SDK" ON)
endif(WIN32)

Expand Down
9 changes: 3 additions & 6 deletions ci/setup_cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,19 @@ if [ "x$CMAKE_VERSION" = "x" ]; then
export CMAKE_VERSION=3.15.2
fi

# This variable not set on CI pipeline for only legacy environment(GCC 4.8).
# With 1.13.0 version, C++14 must be set which does not supported by legacy environment anymore.
# Also with this version, release version path needs to be adapted.
if [ -z "${GOOGLETEST_VERSION}" ]; then
# By default, GoogleTest version set the following version.
# Version by default. Requires C++14.
export GOOGLETEST_VERSION=1.13.0
fi

OLD_GOOGLETEST_VERSION_REGEXP="^1\.([0-9]|10|11|12)(\..*)?$"

# If GoogleTest version less than ${GOOGLETEST_LATEST_VERSION}
# Else otherwise
if [[ ${GOOGLETEST_VERSION} =~ ${OLD_GOOGLETEST_VERSION_REGEXP} ]]; then
# Old (up to 1.12.x included) download URL format.
GOOGLETEST_VERSION_PATH="release-${GOOGLETEST_VERSION}"
GOOGLETEST_FOLDER_PATH="googletest-release-${GOOGLETEST_VERSION}"
else
# New (since 1.13.0) download URL format.
GOOGLETEST_VERSION_PATH="v${GOOGLETEST_VERSION}"
GOOGLETEST_FOLDER_PATH="googletest-${GOOGLETEST_VERSION}"
fi
Expand Down

0 comments on commit bc23e6a

Please sign in to comment.