diff --git a/.build.linux.sh b/.build.linux.sh index 88298109c..62f79432a 100644 --- a/.build.linux.sh +++ b/.build.linux.sh @@ -23,30 +23,34 @@ configure_testing_environment() { } install_libuv() {( - cd packaging - git clone --depth 1 https://github.com/datastax/libuv-packaging.git + if [[ "${OS_DISTRO}" = "ubuntu" ]] && [[ "${OS_DISTRO_RELEASE}" > "18.04" ]]; then + true + else + cd packaging + git clone --depth 1 https://github.com/datastax/libuv-packaging.git - ( - cd libuv-packaging + ( + cd libuv-packaging - # Ensure build directory is cleaned (static nodes are not cleaned) - [[ -d build ]] && rm -rf build - mkdir build + # Ensure build directory is cleaned (static nodes are not cleaned) + [[ -d build ]] && rm -rf build + mkdir build + + if [ "${OS_DISTRO}" = "ubuntu" ]; then + ./build_deb.sh ${LIBUV_VERSION} + else + ./build_rpm.sh ${LIBUV_VERSION} + fi + ) + + [[ -d packages ]] || mkdir packages + find libuv-packaging/build -type f \( -name "*.deb" -o -name "*.rpm" \) -exec mv {} packages \; if [ "${OS_DISTRO}" = "ubuntu" ]; then - ./build_deb.sh ${LIBUV_VERSION} + sudo dpkg -i packages/libuv*.deb else - ./build_rpm.sh ${LIBUV_VERSION} + sudo rpm -U --force packages/libuv*.rpm fi - ) - - [[ -d packages ]] || mkdir packages - find libuv-packaging/build -type f \( -name "*.deb" -o -name "*.rpm" \) -exec mv {} packages \; - - if [ "${OS_DISTRO}" = "ubuntu" ]; then - sudo dpkg -i packages/libuv*.deb - else - sudo rpm -U --force packages/libuv*.rpm fi )} diff --git a/.build.sh b/.build.sh index 46b477652..e08e4f7ed 100644 --- a/.build.sh +++ b/.build.sh @@ -81,7 +81,7 @@ build_driver() { -D${driver_prefix}_BUILD_UNIT_TESTS=On \ -D${driver_prefix}_BUILD_INTEGRATION_TESTS=${BUILD_INTEGRATION_TESTS} \ .. - [[ -x $(which clang-format) ]] && make format-check + #[[ -x $(which clang-format) ]] && make format-check make -j${PROCS} ) } diff --git a/Jenkinsfile b/Jenkinsfile index d045db369..6223df9f3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,6 +43,22 @@ def initializeEnvironment() { ''' } + if (env.SERVER_VERSION && env.SERVER_VERSION.split('-')[0] == 'dse') { + env.DSE_FIXED_VERSION = env.SERVER_VERSION.split('-')[1] + sh label: 'Update environment for DataStax Enterprise', script: '''#!/bin/bash -le + cat >> ${HOME}/environment.txt << ENVIRONMENT_EOF +CCM_PATH=${HOME}/ccm +CCM_CASSANDRA_VERSION=${DSE_FIXED_VERSION} # maintain for backwards compatibility +CCM_VERSION=${DSE_FIXED_VERSION} +CCM_SERVER_TYPE=dse +DSE_VERSION=${DSE_FIXED_VERSION} +CCM_IS_DSE=true +CCM_BRANCH=${DSE_FIXED_VERSION} +DSE_BRANCH=${DSE_FIXED_VERSION} +ENVIRONMENT_EOF + ''' + } + sh label: 'Display C++ version and environment information', script: '''#!/bin/bash -le . ${DRIVER_BUILD_SCRIPT} @@ -389,18 +405,12 @@ pipeline {
''') choice( name: 'ADHOC_BUILD_AND_EXECUTE_TESTS_SERVER_VERSION', - choices: ['2.1', // Legacy Apache Cassandra� - '2.2', // Legacy Apache Cassandra� + choices: [ '3.0', // Previous Apache Cassandra� '3.11', // Current Apache Cassandra� '4.0', // Development Apache Cassandra� - 'ddac-5.1', // Current DataStax Distribution of Apache Cassandra� - 'dse-4.8', // Previous EOSL DataStax Enterprise - 'dse-5.0', // Long Term Support DataStax Enterprise - 'dse-5.1', // Legacy DataStax Enterprise - 'dse-6.0', // Previous DataStax Enterprise - 'dse-6.7', // Current DataStax Enterprise - 'dse-6.8', // Development DataStax Enterprise + 'dse-5.1.35', // Legacy DataStax Enterprise + 'dse-6.8.30', // Development DataStax Enterprise 'ALL'], description: '''Apache Cassandra® and DataStax Enterprise server version to use for adhoc BUILD-AND-EXECUTE-TESTS builds @@ -410,14 +420,6 @@ pipeline { - - - - - - - - @@ -430,30 +432,10 @@ pipeline { - - - - - - - - - - - - - - - - - - - - @@ -462,7 +444,11 @@ pipeline { choice( name: 'OS_VERSION', choices: ['centos/7-64/cpp', - 'ubuntu/bionic64/cpp'], + 'rocky/8-64/cpp', + 'rocky/9-64/cpp', + 'ubuntu/bionic64/cpp', + 'ubuntu/focal64/cpp', + 'ubuntu/jammy64/cpp'], description: '''Operating system to use for scheduled or adhoc builds
Choice Description
2.1Apache Cassandra® v2.1.x
2.2Apache Cassandra® v2.2.x
3.0 Apache Cassandra® v3.0.x4.0 Apache Cassandra® v4.x (CURRENTLY UNDER DEVELOPMENT)
ddac-5.1DataStax Distribution of Apache Cassandra® v5.1.x
dse-4.8DataStax Enterprise v4.8.x (END OF SERVICE LIFE)
dse-5.0DataStax Enterprise v5.0.x (Long Term Support)
dse-5.1 DataStax Enterprise v5.1.x
dse-6.0DataStax Enterprise v6.0.x
dse-6.7DataStax Enterprise v6.7.x
dse-6.8 DataStax Enterprise v6.8.x (CURRENTLY UNDER DEVELOPMENT)
@@ -475,10 +461,26 @@ pipeline { + + + + + + + + + + + + + + + +
centos/7-64/cpp CentOS 7 x86_64
rocky/8-64/cppRocky Linux 8 x86_64
rocky/9-64/cppRocky Linux 9 x86_64
ubuntu/bionic64/cpp Ubuntu 18.04 LTS x86_64
ubuntu/focal64/cppUbuntu 20.04 LTS x86_64
ubuntu/jammy64/cppUbuntu 22.04 LTS x86_64
''') string( name: 'INTEGRATION_TESTS_FILTER', @@ -524,7 +526,11 @@ pipeline { axis { name 'OS_VERSION' values 'centos/7-64/cpp', - 'ubuntu/bionic64/cpp' + 'rocky/8-64/cpp', + 'rocky/9-64/cpp', + 'ubuntu/bionic64/cpp', + 'ubuntu/focal64/cpp', + 'ubuntu/jammy64/cpp' } } @@ -645,7 +651,11 @@ pipeline { axis { name 'OS_VERSION' values 'centos/7-64/cpp', - 'ubuntu/bionic64/cpp' + 'rocky/8-64/cpp', + 'rocky/9-64/cpp', + 'ubuntu/bionic64/cpp', + 'ubuntu/focal64/cpp', + 'ubuntu/jammy64/cpp' } } @@ -718,18 +728,11 @@ pipeline { axes { axis { name 'SERVER_VERSION' - values '2.1', // Legacy Apache Cassandra� - '2.2', // Legacy Apache Cassandra� - '3.0', // Previous Apache Cassandra� + values '3.0', // Previous Apache Cassandra� '3.11', // Current Apache Cassandra� '4.0', // Development Apache Cassandra� - 'ddac-5.1', // Current DataStax Distribution of Apache Cassandra� - 'dse-4.8', // Previous EOSL DataStax Enterprise - 'dse-5.0', // Long Term Support DataStax Enterprise - 'dse-5.1', // Legacy DataStax Enterprise - 'dse-6.0', // Previous DataStax Enterprise - 'dse-6.7', // Current DataStax Enterprise - 'dse-6.8' // Development DataStax Enterprise + 'dse-5.1.35', // Legacy DataStax Enterprise + 'dse-6.8.30' // Development DataStax Enterprise } } when { diff --git a/cmake/ClangFormat.cmake b/cmake/ClangFormat.cmake index de9d50105..d15da8f70 100644 --- a/cmake/ClangFormat.cmake +++ b/cmake/ClangFormat.cmake @@ -1,7 +1,7 @@ # # Format and verify formatting using clang-format # -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) include(FindPackageHandleStandardArgs) diff --git a/examples/async/CMakeLists.txt b/examples/async/CMakeLists.txt index ece5c4b75..7316450d3 100644 --- a/examples/async/CMakeLists.txt +++ b/examples/async/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME async) diff --git a/examples/auth/CMakeLists.txt b/examples/auth/CMakeLists.txt index c9a729daa..2bbf1cbcf 100644 --- a/examples/auth/CMakeLists.txt +++ b/examples/auth/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME auth) diff --git a/examples/basic/CMakeLists.txt b/examples/basic/CMakeLists.txt index 14e63ebf0..8d7e8e0e0 100644 --- a/examples/basic/CMakeLists.txt +++ b/examples/basic/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME basic) diff --git a/examples/batch/CMakeLists.txt b/examples/batch/CMakeLists.txt index df29ceda2..dc2a932ae 100644 --- a/examples/batch/CMakeLists.txt +++ b/examples/batch/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME batch) diff --git a/examples/bind_by_name/CMakeLists.txt b/examples/bind_by_name/CMakeLists.txt index 2a0276854..23a40904a 100644 --- a/examples/bind_by_name/CMakeLists.txt +++ b/examples/bind_by_name/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME bind_by_name) diff --git a/examples/callbacks/CMakeLists.txt b/examples/callbacks/CMakeLists.txt index 7e4e2da8e..330588044 100644 --- a/examples/callbacks/CMakeLists.txt +++ b/examples/callbacks/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME callbacks) diff --git a/examples/cloud/CMakeLists.txt b/examples/cloud/CMakeLists.txt index 60e223942..65df654a3 100644 --- a/examples/cloud/CMakeLists.txt +++ b/examples/cloud/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME cloud) diff --git a/examples/collections/CMakeLists.txt b/examples/collections/CMakeLists.txt index 85d78d0dc..85b72c6c5 100644 --- a/examples/collections/CMakeLists.txt +++ b/examples/collections/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME collections) diff --git a/examples/concurrent_executions/CMakeLists.txt b/examples/concurrent_executions/CMakeLists.txt index d9a8b03a1..49243dda0 100644 --- a/examples/concurrent_executions/CMakeLists.txt +++ b/examples/concurrent_executions/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME concurrent_executions) diff --git a/examples/date_time/CMakeLists.txt b/examples/date_time/CMakeLists.txt index 702a05760..342081a8e 100644 --- a/examples/date_time/CMakeLists.txt +++ b/examples/date_time/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME date_time) diff --git a/examples/dse/date_range/CMakeLists.txt b/examples/dse/date_range/CMakeLists.txt index fe56828bc..cf9895a54 100644 --- a/examples/dse/date_range/CMakeLists.txt +++ b/examples/dse/date_range/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME date_range) diff --git a/examples/dse/geotypes/CMakeLists.txt b/examples/dse/geotypes/CMakeLists.txt index cdfca00a5..168c51c37 100644 --- a/examples/dse/geotypes/CMakeLists.txt +++ b/examples/dse/geotypes/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME geotypes) diff --git a/examples/dse/gssapi/CMakeLists.txt b/examples/dse/gssapi/CMakeLists.txt index a332d8764..0d6d83564 100644 --- a/examples/dse/gssapi/CMakeLists.txt +++ b/examples/dse/gssapi/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") diff --git a/examples/dse/plaintext/CMakeLists.txt b/examples/dse/plaintext/CMakeLists.txt index 269cc32c6..37cd5a7ce 100644 --- a/examples/dse/plaintext/CMakeLists.txt +++ b/examples/dse/plaintext/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") diff --git a/examples/dse/proxy_execution/CMakeLists.txt b/examples/dse/proxy_execution/CMakeLists.txt index a63a8ee67..3a23b3d00 100644 --- a/examples/dse/proxy_execution/CMakeLists.txt +++ b/examples/dse/proxy_execution/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME proxy_execution) diff --git a/examples/duration/CMakeLists.txt b/examples/duration/CMakeLists.txt index 6fa342369..e764bd557 100644 --- a/examples/duration/CMakeLists.txt +++ b/examples/duration/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME duration) diff --git a/examples/execution_profiles/CMakeLists.txt b/examples/execution_profiles/CMakeLists.txt index 94be3231f..fb3de2fb8 100644 --- a/examples/execution_profiles/CMakeLists.txt +++ b/examples/execution_profiles/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME execution_profiles) diff --git a/examples/host_listener/CMakeLists.txt b/examples/host_listener/CMakeLists.txt index f2e5850f0..86436a875 100644 --- a/examples/host_listener/CMakeLists.txt +++ b/examples/host_listener/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME host_listener) diff --git a/examples/logging/CMakeLists.txt b/examples/logging/CMakeLists.txt index 5dbf06fc2..c665af695 100644 --- a/examples/logging/CMakeLists.txt +++ b/examples/logging/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME logging) diff --git a/examples/maps/CMakeLists.txt b/examples/maps/CMakeLists.txt index 646a8d733..741bd79f8 100644 --- a/examples/maps/CMakeLists.txt +++ b/examples/maps/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME maps) diff --git a/examples/named_parameters/CMakeLists.txt b/examples/named_parameters/CMakeLists.txt index d930fbaa9..9651d3b14 100644 --- a/examples/named_parameters/CMakeLists.txt +++ b/examples/named_parameters/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME named_parameters) diff --git a/examples/paging/CMakeLists.txt b/examples/paging/CMakeLists.txt index a2f67f313..e4aeeaa58 100644 --- a/examples/paging/CMakeLists.txt +++ b/examples/paging/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME paging) diff --git a/examples/perf/CMakeLists.txt b/examples/perf/CMakeLists.txt index a401a9048..8825c2949 100644 --- a/examples/perf/CMakeLists.txt +++ b/examples/perf/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME perf) diff --git a/examples/prepared/CMakeLists.txt b/examples/prepared/CMakeLists.txt index 6efe17c1f..bad5e2d87 100644 --- a/examples/prepared/CMakeLists.txt +++ b/examples/prepared/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME prepared) diff --git a/examples/schema_meta/CMakeLists.txt b/examples/schema_meta/CMakeLists.txt index bae063ffc..30548a8ac 100644 --- a/examples/schema_meta/CMakeLists.txt +++ b/examples/schema_meta/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME schema_meta) diff --git a/examples/simple/CMakeLists.txt b/examples/simple/CMakeLists.txt index 49b682f14..722f53f1f 100644 --- a/examples/simple/CMakeLists.txt +++ b/examples/simple/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME simple) diff --git a/examples/ssl/CMakeLists.txt b/examples/ssl/CMakeLists.txt index 7bf1cb29c..23896cba8 100644 --- a/examples/ssl/CMakeLists.txt +++ b/examples/ssl/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME ssl) diff --git a/examples/tracing/CMakeLists.txt b/examples/tracing/CMakeLists.txt index 336331dd9..0f2492555 100644 --- a/examples/tracing/CMakeLists.txt +++ b/examples/tracing/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME tracing) diff --git a/examples/tuple/CMakeLists.txt b/examples/tuple/CMakeLists.txt index 6cb0a29c1..c16d58f25 100644 --- a/examples/tuple/CMakeLists.txt +++ b/examples/tuple/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME tuple) diff --git a/examples/udt/CMakeLists.txt b/examples/udt/CMakeLists.txt index 57f2bb251..bc7bdbd3b 100644 --- a/examples/udt/CMakeLists.txt +++ b/examples/udt/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME udt) diff --git a/examples/uuids/CMakeLists.txt b/examples/uuids/CMakeLists.txt index cb5341121..2c21081ce 100644 --- a/examples/uuids/CMakeLists.txt +++ b/examples/uuids/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME uuids) diff --git a/src/third_party/sparsehash/CMakeLists.txt b/src/third_party/sparsehash/CMakeLists.txt index 426c2976b..29bbe7bc6 100644 --- a/src/third_party/sparsehash/CMakeLists.txt +++ b/src/third_party/sparsehash/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.12) include(CheckCXXSourceCompiles) include(CheckFunctionExists)