Clean up our CMake scripts using features introduced between 3.0 and 3.14 by jkoritzinsky · Pull Request #26980 · dotnet/coreclr

jkoritzinsky · 2019-10-02T00:04:37Z

Now that we're using a consistent modern version of CMake on all platforms, we can significantly clean up our native build scripts.

There's a few things I decided to go fix:

Remove the CLR_CMAKE_COMPILER variable and use generator expressions instead.
Remove the directory-based dac.cmake, crossgen.cmake, md_dac.cmake, md_wks.cmake, and md_dbi.cmake files and drive their inclusion/exclusion of various defines via custom target properties and generator expressions.
Collapse any leaf CMakeLists.txt files that were only leaf nodes because of the above directory-based component definition system.
Convert PCH generation to be target-specific instead of directory-specific.
Convert linker options to be added via add_link_options when possible.
Refactor manual asm preprocessing and compilation (for Windows ARM and ARM64) to a single utility function.
Refactor manual preprocessing to a single xplat function.
Use more of CMake's built-in features for setting up our cross-compilation toolchain.

Fixes CMake's incremental build, but makes MSBuild complain about it's incremental build possibly not working.

…ossgen/dbi variations.

…y files into a cmake function preprocess_compile_asm.

…everywhere except the jit.

…ation (where most of the work was done in the parent).

…ke 3.14)

…eader and remove add_precompiled_header.

…er file instead of making a custom target.

…s for multiple-valued generator expressions.

…coreclr into cmake-3.14-cleanup

…nce SOS moved out of the repo).

clrdefinitions.cmake

configurecompiler.cmake

janvorli · 2019-10-04T15:29:56Z

cross/toolchain.cmake

@@ -35,15 +35,6 @@ if(DEFINED ENV{TOOLCHAIN})
  set(TOOLCHAIN $ENV{TOOLCHAIN})


I am surprised we still use (and have) this file instead of using the shared eng/common/cross/toolchain.cmake. It would be great to start using the shared one (and update it - it is out of date w.r.t. the cross/toolchain.cmake)

We can't update the version in eng/common/cross until we update all repos that would use it to run on images with CMake 3.14+. I'd prefer to update our cross/toolchain.cmake file, then update the images used by the various other repos with native toolsets. Then I'd update the version in eng/common. Once that propagates through, I'd remove the local one.

cross/toolchain.cmake

functions.cmake

src/vm/wks/CMakeLists.txt

…C specifically, not Windows.

jkoritzinsky · 2019-10-07T17:13:35Z

@janvorli can you take another review pass when you have a chance?

janvorli

LGTM, thank you!

+ Auto renames for (dotnet/coreclr/dotnet#26080) + Rename _WIN64 define to BIT64 (dotnet#26080) + Remove stray sos reference (dotnet/runtime/dotnet#1875) + Fix MSVC warn as errors... (dotnet/runtime/dotnet#1876) + Remove unused/unnecessary defines (dotnet/runtime/dotnet#1878) + Rename CLR_CMAKE_PLATFORM* CLR_CMAKE_HOST* (dotnet/runtime/#1974) + Rename PAL_CMAKE_* CLR_CMAKE_* (dotnet/runtime/dotnet#1984) + Add alpinedac & linuxdac build options (dotnet/runtime/dotnet#2056) + Refactor CMake system to allow cross OS DAC compile (dotnet/runtime/#2054) + Add FEATURE_REMOTE_PROC_MEM (dotnet/runtime/dotnet#2244) + Fix compilation of dbgtransportsession (dotnet/runtime/dotnet#2247) + Auto renames from (dotnet/runtime/#2256) + Rename cross compilation related defines (dotnet/runtime/#2256) + Fix logic to disable mscordbi build (dotnet/runtime/#31745) + Fix unused variable warning (dotnet/runtime/#31747) + Remove GetRecycleMemoryInfo from DAC builds (dotnet/runtime/#31748) + Fix check.* cross compilation linker errors (dotnet/runtime/#31751) + Reduce PAL DAC exports (dotnet/runtime/#31749) + Add EMPTY_BASES_DECL (dotnet/runtime/dotnet#26980) + Disable linux unwinder on Windows (dotnet/runtime/#31777) + Add cross OS support for MAKEDLLNAME (dotnet/runtime/#31746) + Fix host compiler when cross OS DAC compiling (dotnet/runtime/#31775) + Fix arm64singlestepper #ifdef (dotnet/runtime/#31776) + Configure host features based on host OS (dotnet/runtime/#31778) + Configure Host OS APIs based on HOST macros (dotnet/runtime/#31774) + Use common CLR_CMAKE_* variables in more places (dotnet/runtime/#31659) + Add T_CRITICAL_SECTION for cross OS DAC compile (dotnet/runtime/#31908) + Fix arm cross OS DAC compilation (dotnet/runtime/#31903) + Add CrossOS DAC build back (dotnet/runtime/#33064) + Fix typo (dotnet/runtime/#33192) + Fix type layout whan Cross OS compiling (dotnet/runtime/#33487) + Partial revert auto renames from (dotnet/runtime/dotnet#2056) + Partial revert (dotnet/runtime/dotnet#26080)

+ Auto renames for (dotnet/coreclr/dotnet#26080) + Rename _WIN64 define to BIT64 (dotnet#26080) + Remove stray sos reference (dotnet/runtime/dotnet#1875) + Fix MSVC warn as errors... (dotnet/runtime/dotnet#1876) + Remove unused/unnecessary defines (dotnet/runtime/dotnet#1878) + Rename CLR_CMAKE_PLATFORM* CLR_CMAKE_HOST* (dotnet/runtime/#1974) + Rename PAL_CMAKE_* CLR_CMAKE_* (dotnet/runtime/dotnet#1984) + Add alpinedac & linuxdac build options (dotnet/runtime/dotnet#2056) + Refactor CMake system to allow cross OS DAC compile (dotnet/runtime/#2054) + Add FEATURE_REMOTE_PROC_MEM (dotnet/runtime/dotnet#2244) + Fix compilation of dbgtransportsession (dotnet/runtime/dotnet#2247) + Auto renames from (dotnet/runtime/#2256) + Rename cross compilation related defines (dotnet/runtime/#2256) + Fix logic to disable mscordbi build (dotnet/runtime/#31745) + Fix unused variable warning (dotnet/runtime/#31747) + Remove GetRecycleMemoryInfo from DAC builds (dotnet/runtime/#31748) + Fix check.* cross compilation linker errors (dotnet/runtime/#31751) + Reduce PAL DAC exports (dotnet/runtime/#31749) + Add EMPTY_BASES_DECL (dotnet/runtime/dotnet#26980) + Disable linux unwinder on Windows (dotnet/runtime/#31777) + Add cross OS support for MAKEDLLNAME (dotnet/runtime/#31746) + Fix host compiler when cross OS DAC compiling (dotnet/runtime/#31775) + Fix arm64singlestepper #ifdef (dotnet/runtime/#31776) + Configure host features based on host OS (dotnet/runtime/#31778) + Configure Host OS APIs based on HOST macros (dotnet/runtime/#31774) + Use common CLR_CMAKE_* variables in more places (dotnet/runtime/#31659) + Add T_CRITICAL_SECTION for cross OS DAC compile (dotnet/runtime/#31908) + Fix arm cross OS DAC compilation (dotnet/runtime/#31903) + Add CrossOS DAC build back (dotnet/runtime/#33064) + Fix typo (dotnet/runtime/#33192) + Fix type layout whan Cross OS compiling (dotnet/runtime/#33487) + Partial revert auto renames from (dotnet/runtime/dotnet#2056) + Partial revert (dotnet/runtime/dotnet#26080) + Enable cross OS DBI build(dotnet/runtime/#35021)

+ Auto renames for (dotnet/coreclr/dotnet#26080) + Rename _WIN64 define to BIT64 (dotnet#26080) + Remove stray sos reference (dotnet/runtime/dotnet#1875) + Fix MSVC warn as errors... (dotnet/runtime/dotnet#1876) + Remove unused/unnecessary defines (dotnet/runtime/dotnet#1878) + Rename CLR_CMAKE_PLATFORM* CLR_CMAKE_HOST* (dotnet/runtime/#1974) + Rename PAL_CMAKE_* CLR_CMAKE_* (dotnet/runtime/dotnet#1984) + Add alpinedac & linuxdac build options (dotnet/runtime/dotnet#2056) + Refactor CMake system to allow cross OS DAC compile (dotnet/runtime/#2054) + Add FEATURE_REMOTE_PROC_MEM (dotnet/runtime/dotnet#2244) + Fix compilation of dbgtransportsession (dotnet/runtime/dotnet#2247) + Auto renames from (dotnet/runtime/#2256) + Rename cross compilation related defines (dotnet/runtime/#2256) + Fix logic to disable mscordbi build (dotnet/runtime/#31745) + Fix unused variable warning (dotnet/runtime/#31747) + Remove GetRecycleMemoryInfo from DAC builds (dotnet/runtime/#31748) + Fix check.* cross compilation linker errors (dotnet/runtime/#31751) + Reduce PAL DAC exports (dotnet/runtime/#31749) + Add EMPTY_BASES_DECL (dotnet/runtime/dotnet#26980) + Disable linux unwinder on Windows (dotnet/runtime/#31777) + Add cross OS support for MAKEDLLNAME (dotnet/runtime/#31746) + Fix host compiler when cross OS DAC compiling (dotnet/runtime/#31775) + Fix arm64singlestepper #ifdef (dotnet/runtime/#31776) + Configure host features based on host OS (dotnet/runtime/#31778) + Configure Host OS APIs based on HOST macros (dotnet/runtime/#31774) + Use common CLR_CMAKE_* variables in more places (dotnet/runtime/#31659) + Add T_CRITICAL_SECTION for cross OS DAC compile (dotnet/runtime/#31908) + Fix arm cross OS DAC compilation (dotnet/runtime/#31903) + Add CrossOS DAC build back (dotnet/runtime/#33064) + Fix typo (dotnet/runtime/#33192) + Fix type layout whan Cross OS compiling (dotnet/runtime/#33487) + Partial revert auto renames from (dotnet/runtime/dotnet#2056) + Partial revert (dotnet/runtime/dotnet#26080) + Enable cross OS DBI build(dotnet/runtime/#35021) + Disable EMPTY_BASE_DECL except for cross OS DAC + Fix DBI type layout issues + Add utilcode_dbi + Consistently define DBI features + Define T_CRITICAL_SECTION during non-DAC builds + Port cross DAC unwind support to 3.1 + Libunwind 1.5rc2 again (dotnet/runtime#36988) + Add libunwind to cross DAC (dotnet/runtime#37521)

jkoritzinsky added 20 commits October 1, 2019 12:36

Try to remove the CLR_CMAKE_COMPILER weirdness.

2c05a7e

Cleanup phase 1.

e4083be

Fixes CMake's incremental build, but makes MSBuild complain about it's incremental build possibly not working.

Drive dac and crossgen-specific defines through target properties.

77e170f

First pass of consolidation of singularly nested CMakeLists.txt files.

b67e02f

Convert metadata libraries to not use leaf folders for dac/runtime/cr…

42b9d11

…ossgen/dbi variations.

Clean up some of the non-arm assembly file handling.

9f89285

Encapsulate arm/arm64 manual preprocessing and compilation of assembl…

d0e7b16

…y files into a cmake function preprocess_compile_asm.

Fix typo.

a25af23

Convert usages of add_precompiled_header to target_precompile_header …

6387772

…everywhere except the jit.

Clean up/remove some leaf CMake files that are just simple target cre…

bff1968

…ation (where most of the work was done in the parent).

Remove unused CMakeLists file and folder.

11ddbc6

Clean up coreclr/CMakeLists.txt

b6eaf0b

Remove conditions based on CMake version (since we're unifying on CMa…

bfcef55

…ke 3.14)

Convert final usages of add_precompiled_header to target_precompile_h…

8ffc90b

…eader and remove add_precompiled_header.

Handle the AsmConstants.inc inclusion in cee_wks by marking it a head…

99d7db1

…er file instead of making a custom target.

Move from deprecated FindPythonInterp module to FindPython module.

df3cde4

Remove unused jitpch.cpp

b9c1878

Fix typo.

1c2c84b

Have get_compile_definitions correctly split out generator expression…

9dcb773

…s for multiple-valued generator expressions.

preprocess_def_file -> preprocess_file and make it work xplat.

61eec15

jkoritzinsky added the area-Build label Oct 2, 2019

jkoritzinsky added this to the 5.0 milestone Oct 2, 2019

jkoritzinsky added 8 commits October 2, 2019 10:23

Fix test build.

79595b4

Merge branch 'cmake-3.14-cleanup' of https://github.com/jkoritzinsky/…

4b59108

…coreclr into cmake-3.14-cleanup

Fix typo in flag.

3ac8708

Fix resource building on non-windows.

9b64813

Fix other linker flag typo I missed.

2534eef

Add missing eventing_headers dependency.

15dc0d9

Merge branch 'cmake-3.14-cleanup' of https://github.com/jkoritzinsky/…

8c23927

…coreclr into cmake-3.14-cleanup

Fix multivalued generator expression.

61f763e

jkoritzinsky added 2 commits October 3, 2019 14:38

Use CMake 3.x features to significantly simplify toolchain.cmake.

b760470

Remove references to LLDB from gen-buildsys-* (these aren't needed si…

a1de66c

…nce SOS moved out of the repo).

jkoritzinsky marked this pull request as ready for review October 4, 2019 00:03

jkoritzinsky requested review from janvorli and jashook October 4, 2019 00:03

janvorli reviewed Oct 4, 2019

View reviewed changes

jkoritzinsky added 7 commits October 4, 2019 12:36

Remove debugging line

f85e525

Check check_pie_supported

cc9c638

Clean up link flags.

a555065

Fix copy-paste typo

e794549

Cleanup. Change some conditions in configurecompiler to check for MSV…

b9679d4

…C specifically, not Windows.

Restore the llldb include and library path searching.

a4f3464

Restore asmconstants_inc custom target.

8c2da3d

janvorli approved these changes Oct 7, 2019

View reviewed changes

jkoritzinsky merged commit 59c7b7e into dotnet:master Oct 7, 2019

jkoritzinsky deleted the cmake-3.14-cleanup branch October 7, 2019 19:11

jkoritzinsky mentioned this pull request Oct 8, 2019

Upgrade CMake to 3.14 dotnet/core-setup#8503

Merged

jashook added area-Infrastructure-coreclr and removed area-Build labels Nov 11, 2019

xiangzhai mentioned this pull request Dec 5, 2019

Sanitizer failed to work dotnet/runtime#553

Closed

omajid mentioned this pull request Jul 3, 2020

runtime depends on extremely recent verisons of cmake, blocking adoption on Linux dotnet/runtime#38755

Closed

jkoritzinsky mentioned this pull request Jul 9, 2020

Minimum CMake downgrade for Linux dotnet/runtime#39044

Merged

jkoritzinsky mentioned this pull request Aug 16, 2022

Proposal: Update minimum CMake version required to build the dotnet/runtime repo to 3.20 dotnet/runtime#74027

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Clean up our CMake scripts using features introduced between 3.0 and 3.14#26980

Clean up our CMake scripts using features introduced between 3.0 and 3.14#26980
jkoritzinsky merged 37 commits intodotnet:masterfrom
jkoritzinsky:cmake-3.14-cleanup

jkoritzinsky commented Oct 2, 2019 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

janvorli Oct 4, 2019

Uh oh!

jkoritzinsky Oct 4, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jkoritzinsky commented Oct 7, 2019

Uh oh!

janvorli left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		@@ -35,15 +35,6 @@ if(DEFINED ENV{TOOLCHAIN})
		set(TOOLCHAIN $ENV{TOOLCHAIN})

Conversation

jkoritzinsky commented Oct 2, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

janvorli Oct 4, 2019

Choose a reason for hiding this comment

Uh oh!

jkoritzinsky Oct 4, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jkoritzinsky commented Oct 7, 2019

Uh oh!

janvorli left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

jkoritzinsky commented Oct 2, 2019 •

edited

Loading