Merge branch 'fix/compile_flags' into 'master'

fix: change cmake build order to propagate flags See merge request multicore/drace!61
siemens · Sep 16, 2019 · 15fdeb4 · 15fdeb4
2 parents 6490563 + 49ab34a
commit 15fdeb4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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