Skip to content

Commit

Permalink
Unify cmake_minimum_required to 3.14.2 (#1315)
Browse files Browse the repository at this point in the history
- Set cmake_minimum_required in top level projects to 3.14.2 (the lowest version used by the CI currently)
- Delete cmake_minimum_required from child projects
- Leave the cmake_minimum_required alone in vendored projects (zlib)
- Note CMake version in the docs

Fixed #1311
  • Loading branch information
jkotas authored Jan 11, 2020
1 parent a1a5e57 commit ffcb1fa
Show file tree
Hide file tree
Showing 117 changed files with 9 additions and 135 deletions.
2 changes: 1 addition & 1 deletion docs/workflow/requirements/linux-requirements.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Minimum RAM required to build is 1GB. The build is known to fail on 512 MB VMs (
Toolchain Setup
---------------

Add Kitware's APT feed to your configuration for a newer version of CMake. See their instructions at <https://apt.kitware.com/>. Also, add LLVM/s APT feed to your configuration for a newer version of CMake. See their instructions as <http://apt.llvm.org/>.
Building the repo requires CMake 3.14.2 or newer on Linux. Add Kitware's APT feed to your configuration for a newer version of CMake. See their instructions at <https://apt.kitware.com/>. Also, add LLVM/s APT feed to your configuration for a newer version of CMake. See their instructions as <http://apt.llvm.org/>.

Install the following packages for the toolchain:

Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.14.2)

cmake_policy(SET CMP0042 NEW)

Expand Down
1 change: 0 additions & 1 deletion src/coreclr/src/ToolBox/SOS/DacTableGen/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required(VERSION 3.8) # This project is only included on Win32 platforms so we can have a higher CMake version requirement since we already require a newer CMake version on Windows for various reasons.
# Quick note: The CMake C# support is using the CSC bundled with the MSBuild that the native build runs on, not the one supplied by the local .NET SDK.

project(DacTableGen LANGUAGES CSharp)
Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/src/pal/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 2.8.12.2)

project(COREPAL)

include(../../clrfeatures.cmake)
Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/src/pal/prebuilt/inc/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 2.8.12.2)

project(COREPAL)

_install (FILES corerror.h corprof.h DESTINATION inc)
Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/src/pal/src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 2.8.12.2)

if(CMAKE_SYSTEM_NAME STREQUAL Darwin OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
# On OSX and *BSD, we use the libunwind that's part of the OS
set(CLR_CMAKE_USE_SYSTEM_LIBUNWIND 1)
Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/src/pal/src/eventprovider/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 2.8.12)

set(EVENT_MANIFEST ${VM_DIR}/ClrEtwAll.man)

if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_FREEBSD)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 2.8.12)

include(FindPython)

set (GENERATE_SCRIPT ${CLR_DIR}/src/scripts/genDummyProvider.py)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 2.8.12)

include(FindPython)
set (GENERATE_SCRIPT ${CLR_DIR}/src/scripts/genLttngProvider.py)

Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/src/pal/src/libunwind/src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 2.8.12.2)

project(unwind)

set(CMAKE_INCLUDE_CURRENT_DIR ON)
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/src/pal/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.12.2)
cmake_minimum_required(VERSION 3.14.2)

if(CLR_CMAKE_PLATFORM_ARCH_I386)
set(PAL_CMAKE_PLATFORM_ARCH_I386 1)
Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/src/pal/tests/palsuite/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 2.8.12.2)

project(PALTESTSUITE)

set(CMAKE_INCLUDE_CURRENT_DIR ON)
Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/src/vm/eventing/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 2.8.12)

set(EVENT_MANIFEST ${VM_DIR}/ClrEtwAll.man)
set(EVENT_EXCLUSIONS ${VM_DIR}/ClrEtwAllMeta.lst)

Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/src/vm/eventing/EtwProvider/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 2.8.12)

include(FindPython)

set(ETW_PROVIDER_SCRIPT ${CLR_DIR}/src/scripts/genEtwProvider.py)
Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/src/vm/eventing/eventpipe/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 2.8.12.2)

include(FindPython)

set(CMAKE_INCLUDE_CURRENT_DIR ON)
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.14.2)

cmake_policy(SET CMP0042 NEW)
project(Tests)
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/tests/src/Common/Platform/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (platformdefines)
set(SOURCES platformdefines.cpp)

Expand Down
1 change: 0 additions & 1 deletion src/coreclr/tests/src/Common/hostpolicymock/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required(VERSION 2.6)
project (hostpolicy)

include_directories(${INC_PLATFORM_DIR})
Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/tests/src/Exceptions/ForeignThread/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
cmake_minimum_required (VERSION 2.6)

project (ForeignThreadExceptionsNative)

include_directories(${INC_PLATFORM_DIR})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (MarshalBoolArrayNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES MarshalBoolArrayNative.cpp)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (MarshalArrayByValNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES MarshalArrayByValNative.cpp)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (SafeArrayNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES SafeArrayNative.cpp RecordNative.cpp)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (BestFitMappingNative)
set(SOURCES BestFitMappingNative.cpp )
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
cmake_minimum_required (VERSION 2.6)

project (COMClientDefaultInterfaces)
include_directories( ${INC_PLATFORM_DIR} )
include_directories( "../../ServerContracts" )
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
cmake_minimum_required (VERSION 2.6)

include_directories( ${INC_PLATFORM_DIR} )
include_directories( "../../ServerContracts" )
include_directories( "../../NativeServer" )
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
cmake_minimum_required (VERSION 2.6)

project (COMClientLicensing)
include_directories( ${INC_PLATFORM_DIR} )
include_directories( "../../ServerContracts" )
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
cmake_minimum_required (VERSION 2.6)

project (COMClientPrimitives)
include_directories( ${INC_PLATFORM_DIR} )
include_directories( "../../ServerContracts" )
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (COMNativeServer)
include_directories( ${INC_PLATFORM_DIR} )
include_directories( "../ServerContracts" )
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (DllImportPath)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (ExactSpellingNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (ExecInDefAppDomDll)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES ExecInDefAppDomDll.cpp )
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (FuncPtrAsDelegateParamNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES FuncPtrAsDelegateParamNative.cpp )
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (CustomMarshalersConflictingNames)
include_directories(${INC_PLATFORM_DIR})
set(SOURCES CustomMarshalerNative.cpp )
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (CopyConstructorMarshaler)
include("../IJW.cmake")

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (IjwNativeCallingManagedDll)
include("../IJW.cmake")

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (IjwNativeDll)
include("../IJW.cmake")

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (IjwNativeVarargs)
include("../IJW.cmake")

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (mscoree)
include_directories( ${INC_PLATFORM_DIR} )
set(SOURCES mscoree.cpp)
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/tests/src/Interop/LayoutClass/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (LayoutClassNative)
include_directories(${INC_PLATFORM_DIR})
set(SOURCES LayoutClassNative.cpp )
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (FunctionPointerNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES FunctionPointerNative.cpp)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (IUnknownNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES IUnknownNative.cpp)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (NativeCallableDll)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES NativeCallableDll.cpp )
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/tests/src/Interop/NativeLibrary/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (NativeLibrary)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES NativeLibrary.cpp)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (ResolveLib)
include_directories(${INC_PLATFORM_DIR})
set(SOURCES ResolveLib.cpp)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (ResolvedLib)
include_directories(${INC_PLATFORM_DIR})
set(SOURCES ResolvedLib.cpp)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

cmake_minimum_required (VERSION 2.6)
project (MarshalArrayByValArrayNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
include_directories("../..")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

cmake_minimum_required (VERSION 2.6)
project (MarshalArrayLPArrayNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
include_directories("../..")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (ArrayWithOffsetNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/tests/src/Interop/PInvoke/AsAny/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (AsAnyNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (LCIDNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (SuppressGCTransitionNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

cmake_minimum_required (VERSION 2.6)
project (Char_BestFitMappingNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

cmake_minimum_required (VERSION 2.6)
project (LPStr_BestFitMappingNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

cmake_minimum_required (VERSION 2.6)
project (CriticalHandlesNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (CustomMarshalersNative)
include_directories(${INC_PLATFORM_DIR})
set(SOURCES CustomMarshalersNative.cpp )
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (NativeDateTime)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

cmake_minimum_required (VERSION 2.6)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES
DecimalTestNative.cpp
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

cmake_minimum_required (VERSION 2.6)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES
DelegateTestNative.cpp
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (GenericsNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
if(CLR_CMAKE_TARGET_ARCH_I386)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (IEnumeratorNative)
include_directories(${INC_PLATFORM_DIR})
set(SOURCES IEnumeratorNative.cpp )
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

cmake_minimum_required (VERSION 2.6)
project (HandleRefNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

cmake_minimum_required (VERSION 2.6)
project (MAWSPINative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

cmake_minimum_required (VERSION 2.6)
project (ThisCallNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

cmake_minimum_required (VERSION 2.6)
project (ComVisibleNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (PInvokeIntNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES PInvokeIntNative.cpp)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (RuntimeHandlesNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES RuntimeHandlesNative.cpp)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

cmake_minimum_required (VERSION 2.6)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES
SafeHandleNative.cpp
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (PInvokePassingByOutNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
include_directories("..")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (PInvokePassingByRefNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
include_directories("..")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (RPIP_ByOutNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
include_directories("..")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (RPIP_ByRefNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
include_directories("..")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (VarargsNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES VarargsNative.cpp )
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required (VERSION 2.6)
project (VariantNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
set(SOURCES VariantNative.cpp)
Expand Down
Loading

0 comments on commit ffcb1fa

Please sign in to comment.