Fixes

JeffersonLab · Aug 5, 2024 · c05216a · c05216a
1 parent ab4cefc
commit c05216a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/src/examples/InteractiveStreamingExample/CMakeLists.txt b/src/examples/InteractiveStreamingExample/CMakeLists.txt
@@ -12,7 +12,7 @@ if (${USE_ROOT} AND ${USE_ZEROMQ})
         PUBLIC_HEADER ${InteractiveStreamingExample_HEADERS})
 
     target_include_directories(InteractiveStreamingExample PUBLIC ${ROOT_INCLUDE_DIRS} ${ZeroMQ_INCLUDE_DIRS})
-    target_link_libraries(InteractiveStreamingExample jana2_shared_lib ${ZeroMQ_LIBRARIES} ${ROOT_LIBRARIES})
+    target_link_libraries(InteractiveStreamingExample PUBLIC ${ZeroMQ_LIBRARIES} ${ROOT_LIBRARIES})
 
 else()
 

diff --git a/src/examples/RootDatamodelExample/CMakeLists.txt b/src/examples/RootDatamodelExample/CMakeLists.txt
@@ -18,7 +18,7 @@ if(${USE_ROOT})
         list(APPEND my_pcms ${CMAKE_CURRENT_BINARY_DIR}/lib${CLASS}_rdict.pcm )
     endforeach()
 
-    set (RootDataModelExample_HEADERS
+    set (RootDatamodelExample_HEADERS
         Hit.h 
         Cluster.h 
         JFactory_Cluster.h
@@ -33,9 +33,9 @@ if(${USE_ROOT})
         G__Hit.cxx
         G__Cluster.cxx)
 
-    add_jana_plugin(RootDataModelExample 
+    add_jana_plugin(RootDatamodelExample 
         SOURCES ${RootDatamodelExample_SOURCES}
-        PUBLIC_HEADER ${RootDataModelExample_HEADERS})
+        PUBLIC_HEADER ${RootDatamodelExample_HEADERS})
 
     target_include_directories(RootDatamodelExample PUBLIC ${ROOT_INCLUDE_DIRS})
     target_link_libraries(RootDatamodelExample PUBLIC ${ROOT_LIBRARIES})

diff --git a/src/examples/StreamingExample/CMakeLists.txt b/src/examples/StreamingExample/CMakeLists.txt
@@ -17,7 +17,7 @@ if (USE_ZEROMQ)
         PUBLIC_HEADER ${StreamingExample_HEADERS})
 
     target_include_directories(StreamingExample PUBLIC ${ZeroMQ_INCLUDE_DIRS})
-    target_link_libraries(StreamingExample jana2 ${ZeroMQ_LIBRARIES})
+    target_link_libraries(StreamingExample PUBLIC ${ZeroMQ_LIBRARIES})
 
 else()
 

diff --git a/src/plugins/janacontrol/CMakeLists.txt b/src/plugins/janacontrol/CMakeLists.txt
@@ -14,8 +14,7 @@ if (${USE_ZEROMQ})
         JControlEventProcessor.h)
 
     set (janacontrol_PLUGIN_TESTS
-        TestsMain.cc
-        janacontrol-tests.cc
+        janacontrol_tests.cc
     )
 
     add_jana_plugin(janacontrol
@@ -24,9 +23,9 @@ if (${USE_ZEROMQ})
         TESTS ${janacontrol_PLUGIN_TESTS})
 
     target_include_directories(janacontrol PUBLIC ${ZeroMQ_INCLUDE_DIRS})
-    target_link_libraries(janacontrol ${ZeroMQ_LIBRARIES})
+    target_link_libraries(janacontrol PUBLIC ${ZeroMQ_LIBRARIES})
     target_include_directories(janacontrol_tests PUBLIC ${ZeroMQ_INCLUDE_DIRS})
-    target_link_libraries(janacontrol_tests ${ZeroMQ_LIBRARIES})
+    target_link_libraries(janacontrol_tests PUBLIC ${ZeroMQ_LIBRARIES})
 
 else()
     message(STATUS "Skipping plugins/janacontrol because USE_ZEROMQ=Off")

diff --git a/src/plugins/janarate/CMakeLists.txt b/src/plugins/janarate/CMakeLists.txt
@@ -6,7 +6,7 @@ if (${USE_ROOT})
     add_jana_plugin(janarate SOURCES JEventProcessorJANARATE.cc PUBLIC_HEADER ${JTEST_HEADERS})
 
     target_include_directories(janarate PUBLIC ${ROOT_INCLUDE_DIRS})
-    target_link_libraries(janarate jana2 ${ROOT_LIBRARIES})
+    target_link_libraries(janarate PUBLIC ${ROOT_LIBRARIES})
 
 else()
     message(STATUS "Skipping plugins/janarate because USE_ROOT=Off")