From 49ab34a41b81957fc4bde81a263c10027fa85bec Mon Sep 17 00:00:00 2001 From: Felix Moessbauer Date: Mon, 16 Sep 2019 15:17:44 +0200 Subject: [PATCH] fix: change cmake build order to propagate flags --- drace-client/CMakeLists.txt | 6 ++++-- drace-client/detectors/tsan/CMakeLists.txt | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drace-client/CMakeLists.txt b/drace-client/CMakeLists.txt index d6e11d9..59329e3 100644 --- a/drace-client/CMakeLists.txt +++ b/drace-client/CMakeLists.txt @@ -15,6 +15,10 @@ set(SOURCES find_package(DynamoRIO 7.0 REQUIRED) +# Bind detectors prior to first "configure_DynamoRIO_client" +# as DR changes global vars +add_subdirectory("detectors") + add_library("drace-client" SHARED ${SOURCES}) target_include_directories("drace-client" PRIVATE "include") @@ -28,8 +32,6 @@ use_DynamoRIO_extension("drace-client" drreg) use_DynamoRIO_extension("drace-client" drwrap) use_DynamoRIO_extension("drace-client" drsyms) -# Bind detectors -add_subdirectory("detectors") target_link_libraries( "drace-client" # main drace-libs "drace-common" # drace and msr common libs diff --git a/drace-client/detectors/tsan/CMakeLists.txt b/drace-client/detectors/tsan/CMakeLists.txt index 3b413da..65296bd 100644 --- a/drace-client/detectors/tsan/CMakeLists.txt +++ b/drace-client/detectors/tsan/CMakeLists.txt @@ -1,5 +1,7 @@ add_library("drace.detector.tsan" SHARED "tsan") -target_link_libraries("drace.detector.tsan" "tsan-common" "drace-common") +target_link_libraries("drace.detector.tsan" + PRIVATE "tsan-common" + PRIVATE "drace-common") install(TARGETS "drace.detector.tsan" RUNTIME DESTINATION bin COMPONENT Runtime) # copy detector dlls to drace-client binary dir