diff options
| author | Jeremy Koritzinsky <jekoritz@microsoft.com> | 2019-05-10 16:24:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-10 16:24:42 -0700 |
| commit | e985b20260631c98a09f08cb67e93d690a6ffd0b (patch) | |
| tree | f78350febda1071e413382c879726f111bd62c36 /src/utilcode | |
| parent | 0dd7c86c8573f257cfd3b4b6374b7415fd3a9131 (diff) | |
| download | coreclr-e985b20260631c98a09f08cb67e93d690a6ffd0b.tar.gz coreclr-e985b20260631c98a09f08cb67e93d690a6ffd0b.tar.bz2 coreclr-e985b20260631c98a09f08cb67e93d690a6ffd0b.zip | |
Move EventProvider native layout to be driven by CMake configure (#24478)
* Generate eventpipe implementation as part of CMake configure.
* Generate Etw provider as part of CMake configure.
* First pass porting over lttng provider to cmake.
* Fix up CMake Lttng provider generation.
* Move Lttng provider into CMake tree.
* Move dummy event provider to CMake
* Move genEventing into the CMake tree.
* Remove extraneous logging and unused python locator.
* Clean up build.sh
* Clean up genEventingTests.py
* Add dependencies to enable more incremental builds (providers not fully incremental).
* Convert to custom command and targets instead of at configure time.
* Get each eventing target to incrementally build.
* Fix incremental builds
* Add missing dependencies on eventing headers.
* PR Feedback. Mark all generated files as generated
* Clean up eventprovider test CMakeLists
Diffstat (limited to 'src/utilcode')
| -rw-r--r-- | src/utilcode/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/utilcode/crossgen/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/utilcode/dac/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/utilcode/dyncrt/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/utilcode/staticnohost/CMakeLists.txt | 2 |
5 files changed, 10 insertions, 0 deletions
diff --git a/src/utilcode/CMakeLists.txt b/src/utilcode/CMakeLists.txt index fa9abb73c8..4e5f73faf1 100644 --- a/src/utilcode/CMakeLists.txt +++ b/src/utilcode/CMakeLists.txt @@ -101,6 +101,8 @@ set(UTILCODE_STATICNOHOST_SOURCES hostimpl.cpp ) +set (UTILCODE_DEPENDENCIES eventing_headers) + convert_to_absolute_path(UTILCODE_SOURCES ${UTILCODE_SOURCES}) convert_to_absolute_path(UTILCODE_DAC_SOURCES ${UTILCODE_DAC_SOURCES}) convert_to_absolute_path(UTILCODE_CROSSGEN_SOURCES ${UTILCODE_CROSSGEN_SOURCES}) diff --git a/src/utilcode/crossgen/CMakeLists.txt b/src/utilcode/crossgen/CMakeLists.txt index cfa3370c1a..41dd6d2306 100644 --- a/src/utilcode/crossgen/CMakeLists.txt +++ b/src/utilcode/crossgen/CMakeLists.txt @@ -5,3 +5,5 @@ add_library_clr(utilcode_crossgen STATIC ${UTILCODE_CROSSGEN_SOURCES}) if(CLR_CMAKE_PLATFORM_UNIX) target_link_libraries(utilcode_crossgen nativeresourcestring) endif(CLR_CMAKE_PLATFORM_UNIX) + +add_dependencies(utilcode_crossgen ${UTILCODE_DEPENDENCIES}) diff --git a/src/utilcode/dac/CMakeLists.txt b/src/utilcode/dac/CMakeLists.txt index 9199fcce65..07d3e1b422 100644 --- a/src/utilcode/dac/CMakeLists.txt +++ b/src/utilcode/dac/CMakeLists.txt @@ -10,3 +10,5 @@ else() add_precompiled_header(stdafx.h ../stdafx.cpp UTILCODE_DAC_SOURCES) add_library_clr(utilcode_dac STATIC ${UTILCODE_DAC_SOURCES}) endif(CLR_CMAKE_PLATFORM_UNIX) + +add_dependencies(utilcode_dac ${UTILCODE_DEPENDENCIES}) diff --git a/src/utilcode/dyncrt/CMakeLists.txt b/src/utilcode/dyncrt/CMakeLists.txt index 1de80fcfb5..752e32b9e9 100644 --- a/src/utilcode/dyncrt/CMakeLists.txt +++ b/src/utilcode/dyncrt/CMakeLists.txt @@ -7,3 +7,5 @@ else() add_precompiled_header(stdafx.h ../stdafx.cpp UTILCODE_SOURCES) add_library_clr(utilcode STATIC ${UTILCODE_SOURCES}) endif(CLR_CMAKE_PLATFORM_UNIX) + +add_dependencies(utilcode ${UTILCODE_DEPENDENCIES}) diff --git a/src/utilcode/staticnohost/CMakeLists.txt b/src/utilcode/staticnohost/CMakeLists.txt index eea4d60785..5947718d89 100644 --- a/src/utilcode/staticnohost/CMakeLists.txt +++ b/src/utilcode/staticnohost/CMakeLists.txt @@ -10,3 +10,5 @@ add_library_clr(utilcodestaticnohost STATIC ${UTILCODE_STATICNOHOST_SOURCES}) if(CLR_CMAKE_PLATFORM_UNIX) target_link_libraries(utilcodestaticnohost nativeresourcestring) endif(CLR_CMAKE_PLATFORM_UNIX) + +add_dependencies(utilcodestaticnohost ${UTILCODE_DEPENDENCIES}) |