From 071c9b9612f87c41fa87d3139775c4f11eb8cc79 Mon Sep 17 00:00:00 2001 From: Jason Gauci Date: Sat, 6 Mar 2021 21:39:42 -0600 Subject: [PATCH] use older cmake for non-windows (#405) * use older cmake for non-windows * filter CI --- .circleci/config.yml | 1 + .github/workflows/linux_ci.yml | 2 ++ .github/workflows/mac_ci.yml | 2 ++ .github/workflows/vcpkg_build.yml | 2 ++ CMakeLists.txt | 14 ++++++++++++-- 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 88ade4232..cca8998f6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -82,3 +82,4 @@ workflows: branches: ignore: - release + - deployment diff --git a/.github/workflows/linux_ci.yml b/.github/workflows/linux_ci.yml index 75d45d0d2..bc6bcdf64 100644 --- a/.github/workflows/linux_ci.yml +++ b/.github/workflows/linux_ci.yml @@ -2,6 +2,8 @@ name: Linux CI on: push: + branches: + - master pull_request: jobs: diff --git a/.github/workflows/mac_ci.yml b/.github/workflows/mac_ci.yml index 4295e9c78..dba1ecd44 100644 --- a/.github/workflows/mac_ci.yml +++ b/.github/workflows/mac_ci.yml @@ -2,6 +2,8 @@ name: Mac CI on: push: + branches: + - master pull_request: jobs: diff --git a/.github/workflows/vcpkg_build.yml b/.github/workflows/vcpkg_build.yml index dbc5f5f88..d6cdf2386 100644 --- a/.github/workflows/vcpkg_build.yml +++ b/.github/workflows/vcpkg_build.yml @@ -1,6 +1,8 @@ name: Vcpkg Build on: push: + branches: + - master pull_request: jobs: diff --git a/CMakeLists.txt b/CMakeLists.txt index 0bfb358f2..69225cfab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15.0) +cmake_minimum_required(VERSION 3.0.2) set(EXTERNAL_DIR "${CMAKE_SOURCE_DIR}/external") @@ -63,7 +63,17 @@ else() endif() endif() -project(EternalTCP VERSION 6.1.1) +# Don't specify languages yet in case we need to bump the cmake version +project(EternalTCP VERSION 6.1.1 LANGUAGES NONE) + +if(WIN32) +message(STATUS "Windows detected. Bumping up cmake version.") +# Hack to force a higher minimum version on windows +cmake_minimum_required(VERSION 3.15.0) +endif() + +enable_language(C) +enable_language(CXX) include(CMakeFindDependencyMacro)