"consistent target link signatures in cmake; updates #255"

ess-dmsc · Oct 14, 2021 · a5eae9d · a5eae9d
1 parent 6477340
commit a5eae9d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/source/cmd/CMakeLists.txt b/source/cmd/CMakeLists.txt
@@ -14,7 +14,7 @@ target_link_libraries(
 
 # Link stdc++fs or c++experimental to get std::experimental::filesystem when necessary
 target_link_libraries(${this_target}
-  $<$<AND:$<CXX_COMPILER_ID:GNU>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,9.0>>:stdc++fs>)
+  PRIVATE $<$<AND:$<CXX_COMPILER_ID:GNU>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,9.0>>:stdc++fs>)
 target_link_libraries(${this_target}
-  $<$<AND:$<CXX_COMPILER_ID:AppleClang>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,11.0>>:c++fs>)
+  PRIVATE $<$<AND:$<CXX_COMPILER_ID:AppleClang>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,11.0>>:c++fs>)
 
diff --git a/source/daqlite/CMakeLists.txt b/source/daqlite/CMakeLists.txt
@@ -41,7 +41,12 @@ target_link_libraries(
   PUBLIC fmt::fmt
   PRIVATE RdKafka::rdkafka++
   PRIVATE RdKafka::rdkafka
-  QPlot
-  QtColorWidgets
-  Qt5::Widgets
+  PRIVATE QPlot
+  PRIVATE QtColorWidgets
+  PRIVATE Qt5::Widgets
 )
+
+target_link_libraries(${this_target}
+  PRIVATE $<$<AND:$<CXX_COMPILER_ID:GNU>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,9.0>>:stdc++fs>)
+target_link_libraries(${this_target}
+  PRIVATE $<$<AND:$<CXX_COMPILER_ID:AppleClang>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,11.0>>:c++fs>)
diff --git a/source/gui/CMakeLists.txt b/source/gui/CMakeLists.txt
@@ -56,18 +56,18 @@ target_include_directories(
 
 target_link_libraries(
   ${this_target}
-  ${PROJECT_NAME}_core
-  ${PROJECT_NAME}_producers
-  ${PROJECT_NAME}_consumers
-  QPlot
-  QtColorWidgets
-  Qt5::Widgets
-  Qt5::PrintSupport
-  Qt5::Network
+  PRIVATE ${PROJECT_NAME}_core
+  PRIVATE ${PROJECT_NAME}_producers
+  PRIVATE ${PROJECT_NAME}_consumers
+  PRIVATE QPlot
+  PRIVATE QtColorWidgets
+  PRIVATE Qt5::Widgets
+  PRIVATE Qt5::PrintSupport
+  PRIVATE Qt5::Network
 )
 
 # Link stdc++fs or c++experimental to get std::experimental::filesystem when necessary
 target_link_libraries(${this_target}
-  $<$<AND:$<CXX_COMPILER_ID:GNU>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,9.0>>:stdc++fs>)
+  PRIVATE $<$<AND:$<CXX_COMPILER_ID:GNU>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,9.0>>:stdc++fs>)
 target_link_libraries(${this_target}
-  $<$<AND:$<CXX_COMPILER_ID:AppleClang>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,11.0>>:c++fs>)
+  PRIVATE $<$<AND:$<CXX_COMPILER_ID:AppleClang>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,11.0>>:c++fs>)