Skip to content

Commit

Permalink
use older cmake for non-windows (#405)
Browse files Browse the repository at this point in the history
* use older cmake for non-windows

* filter CI
  • Loading branch information
MisterTea authored Mar 7, 2021
1 parent 5824134 commit 071c9b9
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 2 deletions.
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,4 @@ workflows:
branches:
ignore:
- release
- deployment
2 changes: 2 additions & 0 deletions .github/workflows/linux_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: Linux CI

on:
push:
branches:
- master
pull_request:

jobs:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/mac_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: Mac CI

on:
push:
branches:
- master
pull_request:

jobs:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/vcpkg_build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: Vcpkg Build
on:
push:
branches:
- master
pull_request:

jobs:
Expand Down
14 changes: 12 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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")

Expand Down Expand Up @@ -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)

Expand Down

0 comments on commit 071c9b9

Please sign in to comment.