From e985b20260631c98a09f08cb67e93d690a6ffd0b Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 10 May 2019 16:24:42 -0700 Subject: 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 --- src/debug/daccess/CMakeLists.txt | 2 ++ src/debug/di/CMakeLists.txt | 1 + src/debug/ee/dac/CMakeLists.txt | 1 + src/debug/ee/wks/CMakeLists.txt | 2 ++ 4 files changed, 6 insertions(+) (limited to 'src/debug') diff --git a/src/debug/daccess/CMakeLists.txt b/src/debug/daccess/CMakeLists.txt index aab3f81ac6..0e8ccfe67f 100644 --- a/src/debug/daccess/CMakeLists.txt +++ b/src/debug/daccess/CMakeLists.txt @@ -43,6 +43,8 @@ add_precompiled_header(stdafx.h stdafx.cpp DACCESS_SOURCES) add_library_clr(daccess ${DACCESS_SOURCES}) +add_dependencies(daccess eventing_headers) + if(CLR_CMAKE_PLATFORM_UNIX) add_custom_command( OUTPUT ${GENERATED_INCLUDE_DIR}/dactablerva.h diff --git a/src/debug/di/CMakeLists.txt b/src/debug/di/CMakeLists.txt index de6ea238ba..8b37c247f9 100644 --- a/src/debug/di/CMakeLists.txt +++ b/src/debug/di/CMakeLists.txt @@ -109,3 +109,4 @@ endif (WIN32) list(APPEND CORDBDI_SOURCES ${CORDBDI_SOURCES_ASM_FILE}) add_library_clr(cordbdi STATIC ${CORDBDI_SOURCES}) +add_dependencies(cordbdi eventing_headers) diff --git a/src/debug/ee/dac/CMakeLists.txt b/src/debug/ee/dac/CMakeLists.txt index 3bdfd317d1..ceae5c9faa 100644 --- a/src/debug/ee/dac/CMakeLists.txt +++ b/src/debug/ee/dac/CMakeLists.txt @@ -8,3 +8,4 @@ if (WIN32) endif (WIN32) add_library_clr(cordbee_dac ${CORDBEE_SOURCES_DAC}) +add_dependencies(cordbee_dac eventing_headers) diff --git a/src/debug/ee/wks/CMakeLists.txt b/src/debug/ee/wks/CMakeLists.txt index 66a73b3b59..c6a4bccb08 100644 --- a/src/debug/ee/wks/CMakeLists.txt +++ b/src/debug/ee/wks/CMakeLists.txt @@ -63,3 +63,5 @@ else () endif() endif (WIN32) + +add_dependencies(cordbee_wks eventing_headers) -- cgit v1.2.3