Ensure we use only namespaced target names

aphecetche · sawenzel · commit 075eb4aed92f · 2019-09-26T09:39:32.000+02:00
diff --git a/Detectors/gconfig/CMakeLists.txt b/Detectors/gconfig/CMakeLists.txt
@@ -11,13 +11,13 @@
 o2_add_library(SimSetup
                SOURCES src/G3Config.cxx src/G4Config.cxx
                        src/GlobalProcessCutSimParam.cxx src/SimSetup.cxx
-               PUBLIC_LINK_LIBRARIES geant321
-                                     geant4vmc
-                                     geant4
+               PUBLIC_LINK_LIBRARIES MC::Geant3
+                                     MC::Geant4VMC
+                                     MC::Geant4
                                      O2::SimulationDataFormat
                                      O2::DetectorsPassive
-                                     pythia6 # this is needed by Geant3 and
-                                             # EGPythia6
+                                     MC::Pythia6 # this is needed by Geant3 and
+                                                 # EGPythia6
                                      ROOT::EGPythia6 # this is needed by Geant4
                                                      # (TPythia6Decayer)
                )
diff --git a/Framework/ArrowTests/CMakeLists.txt b/Framework/ArrowTests/CMakeLists.txt
@@ -11,5 +11,5 @@
 o2_add_test(01
             SOURCES test/test_Arrow01.cxx
             COMPONENT_NAME arrow
-            PUBLIC_LINK_LIBRARIES arrow_shared
+            PUBLIC_LINK_LIBRARIES arrow::arrow_shared
             LABELS arrow)
diff --git a/Framework/Core/CMakeLists.txt b/Framework/Core/CMakeLists.txt
@@ -110,7 +110,7 @@ o2_add_library(Framework
                                      O2::MemoryResources
                                      O2::PCG
                                      RapidJSON::RapidJSON
-                                     arrow_shared
+                                     arrow::arrow_shared
                                      ms_gsl::ms_gsl
                                      ROOT::ROOTDataFrame
                                      ${DEBUGGUI_TARGET}
@@ -271,26 +271,21 @@ foreach(w
               COMMAND_LINE_ARGS --run)
 endforeach()
 
-# TODO: DanglingInput test not working for the moment
-#    [ERROR] Unable to relay part.
-#    [WARN] Incoming data is already obsolete, not relaying.
-set_property(TEST test_Framework_test_DanglingInputs
-             PROPERTY DISABLED TRUE)
+# TODO: DanglingInput test not working for the moment [ERROR] Unable to relay
+# part. [WARN] Incoming data is already obsolete, not relaying.
+set_property(TEST test_Framework_test_DanglingInputs PROPERTY DISABLED TRUE)
 
-# TODO: investigate the problem with the two unit tests, maybe setup of the CI environment
-# assertion fired
-#     X11: The DISPLAY environment variable is missing
-#     glfw-3.2.1/src/window.c:579: glfwGetFramebufferSize: Assertion `window != ((void *)0)' failed.
-set_property(TEST test_Framework_test_CustomGUIGL
-             PROPERTY DISABLED TRUE)
-set_property(TEST test_Framework_test_CustomGUISokol
-             PROPERTY DISABLED TRUE)
+# TODO: investigate the problem with the two unit tests, maybe setup of the CI
+# environment assertion fired X11: The DISPLAY environment variable is missing
+# glfw-3.2.1/src/window.c:579: glfwGetFramebufferSize: Assertion `window !=
+# ((void *)0)' failed.
+set_property(TEST test_Framework_test_CustomGUIGL PROPERTY DISABLED TRUE)
+set_property(TEST test_Framework_test_CustomGUISokol PROPERTY DISABLED TRUE)
 
 # TODO: investigate the problem and re-enable
 set_property(TEST test_Framework_test_BoostSerializedProcessing
              PROPERTY DISABLED TRUE)
 
-
 # specific tests which needs command line options
 o2_add_test(
   ProcessorOptions NAME test_Framework_test_ProcessorOptions
diff --git a/Framework/DebugGUI/CMakeLists.txt b/Framework/DebugGUI/CMakeLists.txt
@@ -16,7 +16,7 @@ if(GLFW_FOUND)
       src/GL3DUtils.cxx
       src/HandMade3DImpl.cxx
       src/DebugGUI.cxx)
-  set(GUI_TARGET glfw)
+  set(GUI_TARGET glfw::glfw)
 else()
   set(GUI_BACKEND src/Dummy3DUtils.cxx src/DummyDebugGUI.cxx)
   set(GUI_TARGET "")
diff --git a/Generators/CMakeLists.txt b/Generators/CMakeLists.txt
@@ -9,11 +9,11 @@
 # submit itself to any jurisdiction.
 
 if(pythia_FOUND)
-  set(pythiaTarget pythia)
+  set(pythiaTarget MC::Pythia)
 endif()
 
 if(HepMC_FOUND)
-  set(hepmcTarget HepMC)
+        set(hepmcTarget MC::HepMC)
 endif()
 
 o2_add_library(Generators
@@ -67,7 +67,7 @@ o2_add_test_root_macro(share/external/extgen.C
                        LABELS generators)
 if(pythia6_FOUND)
   o2_add_test_root_macro(share/external/pythia6.C
-                         PUBLIC_LINK_LIBRARIES O2::Generators pythia6
+                         PUBLIC_LINK_LIBRARIES O2::Generators MC::Pythia6
                          LABELS generators)
 endif()
 o2_add_test_root_macro(share/external/tgenerator.C
diff --git a/cmake/O2AddExecutable.cmake b/cmake/O2AddExecutable.cmake
@@ -105,6 +105,10 @@ function(o2_add_executable baseTargetName)
 
   # use its dependencies
   foreach(lib IN LISTS A_PUBLIC_LINK_LIBRARIES)
+    string(FIND ${lib} "::" NS)
+    if(${NS} EQUAL -1)
+      message(FATAL_ERROR "Trying to use a non-namespaced target ${lib}")
+    endif()
     target_link_libraries(${target} PUBLIC ${lib})
   endforeach()
 
diff --git a/cmake/O2AddLibrary.cmake b/cmake/O2AddLibrary.cmake
@@ -84,6 +84,10 @@ function(o2_add_library baseTargetName)
   # Start by adding the dependencies to other targets
   if(A_PUBLIC_LINK_LIBRARIES)
     foreach(L IN LISTS A_PUBLIC_LINK_LIBRARIES)
+      string(FIND ${L} "::" NS)
+      if(${NS} EQUAL -1)
+        message(FATAL_ERROR "Trying to use a non-namespaced target ${L}")
+      endif()
       target_link_libraries(${target} PUBLIC ${L})
     endforeach()
   endif()
diff --git a/cmake/O2AddTestRootMacro.cmake b/cmake/O2AddTestRootMacro.cmake
@@ -72,7 +72,6 @@ function(o2_add_test_root_macro macro)
 
   get_filename_component(macroFileName ${macro} ABSOLUTE)
 
-
   if(NOT EXISTS ${macroFileName})
     message(
       FATAL_ERROR
@@ -91,6 +90,14 @@ function(o2_add_test_root_macro macro)
 
   # Get all the include dir dependencies
   foreach(t IN LISTS A_PUBLIC_LINK_LIBRARIES)
+    string(FIND ${t} "::" NS)
+    if(${NS} EQUAL -1)
+      message(
+        WARNING
+          "Trying to use a non-namespaced target ${t} for ${testName} test so I won't be able to generate that test."
+        )
+      return()
+    endif()
     list(APPEND dependencies ${t})
   endforeach()
 
diff --git a/dependencies/FindGLFW.cmake b/dependencies/FindGLFW.cmake
@@ -0,0 +1,22 @@
+# Copyright CERN and copyright holders of ALICE O2. This software is distributed
+# under the terms of the GNU General Public License v3 (GPL Version 3), copied
+# verbatim in the file "COPYING".
+#
+# See http://alice-o2.web.cern.ch/license for full licensing information.
+#
+# In applying this license CERN does not waive the privileges and immunities
+# granted to it by virtue of its status as an Intergovernmental Organization or
+# submit itself to any jurisdiction.
+
+# Simply provide a namespaced alias for the existing target 
+
+find_package(GLFW NAMES glfw3 CONFIG)
+if(NOT GLFW_FOUND)
+  return()
+endif()
+
+# Promote the imported target to global visibility
+# (so we can alias it)
+set_target_properties(glfw PROPERTIES IMPORTED_GLOBAL TRUE)
+
+add_library(glfw::glfw ALIAS glfw)
diff --git a/dependencies/FindGeant3.cmake b/dependencies/FindGeant3.cmake
@@ -19,3 +19,9 @@ endif()
 set_target_properties(geant321
                       PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
                                  "${Geant3_INCLUDE_DIRS}")
+
+# Promote the imported target to global visibility
+# (so we can alias it)
+set_target_properties(geant321 PROPERTIES IMPORTED_GLOBAL TRUE)
+
+add_library(MC::Geant3 ALIAS geant321)
diff --git a/dependencies/FindGeant4.cmake b/dependencies/FindGeant4.cmake
@@ -21,3 +21,9 @@ add_library(geant4 IMPORTED INTERFACE)
 set_target_properties(geant4
                       PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
                                  "${Geant4_INCLUDE_DIRS}")
+
+# Promote the imported target to global visibility
+# (so we can alias it)
+set_target_properties(geant4 PROPERTIES IMPORTED_GLOBAL TRUE)
+
+add_library(MC::Geant4 ALIAS geant4)
diff --git a/dependencies/FindGeant4VMC.cmake b/dependencies/FindGeant4VMC.cmake
@@ -18,4 +18,10 @@ endif()
 
 set_target_properties(geant4vmc
                       PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
-                                 "${Geant4VMC_INCLUDE_DIRS}")
+                                "${Geant4VMC_INCLUDE_DIRS}")
+
+# Promote the imported target to global visibility
+# (so we can alias it)
+set_target_properties(geant4vmc PROPERTIES IMPORTED_GLOBAL TRUE)
+
+add_library(MC::Geant4VMC ALIAS geant4vmc)
diff --git a/dependencies/FindHepMC.cmake b/dependencies/FindHepMC.cmake
@@ -13,13 +13,16 @@
 
 find_package(HepMC NO_MODULE)
 if(NOT HepMC_FOUND)
-  return()
+        return()
 endif()
 
 add_library(HepMC IMPORTED INTERFACE)
 
 set_target_properties(HepMC
-                      PROPERTIES
-		      INTERFACE_LINK_LIBRARIES "${HEPMC_LIBRARIES}"
-		      INTERFACE_INCLUDE_DIRECTORIES "${HEPMC_INCLUDE_DIR}")
+        PROPERTIES
+        INTERFACE_LINK_LIBRARIES "${HEPMC_LIBRARIES}"
+        INTERFACE_INCLUDE_DIRECTORIES "${HEPMC_INCLUDE_DIR}")
 
+# Promote the imported target to global visibility (so we can alias it)
+set_target_properties(HepMC PROPERTIES IMPORTED_GLOBAL TRUE)
+add_library(MC::HepMC ALIAS HepMC)
diff --git a/dependencies/Findarrow.cmake b/dependencies/Findarrow.cmake
@@ -0,0 +1,21 @@
+# Copyright CERN and copyright holders of ALICE O2. This software is distributed
+# under the terms of the GNU General Public License v3 (GPL Version 3), copied
+# verbatim in the file "COPYING".
+#
+# See http://alice-o2.web.cern.ch/license for full licensing information.
+#
+# In applying this license CERN does not waive the privileges and immunities
+# granted to it by virtue of its status as an Intergovernmental Organization or
+# submit itself to any jurisdiction.
+
+# Simply provide a namespaced alias for the existing target
+
+find_package(arrow CONFIG)
+if(NOT arrow_FOUND)
+  return()
+endif()
+
+# Promote the imported target to global visibility (so we can alias it)
+set_target_properties(arrow_shared PROPERTIES IMPORTED_GLOBAL TRUE)
+
+add_library(arrow::arrow_shared ALIAS arrow_shared)
diff --git a/dependencies/Findpythia.cmake b/dependencies/Findpythia.cmake
@@ -16,8 +16,9 @@ find_path(${PKGNAME}_INCLUDE_DIR
           PATH_SUFFIXES Pythia8
           PATHS $ENV{${PKGENVNAME}_ROOT}/include)
 
-find_library(${PKGNAME}_LIBRARY_SHARED NAMES libpythia8.so libpythia8.dylib
-          PATHS $ENV{${PKGENVNAME}_ROOT}/lib)
+find_library(${PKGNAME}_LIBRARY_SHARED
+             NAMES libpythia8.so libpythia8.dylib
+             PATHS $ENV{${PKGENVNAME}_ROOT}/lib)
 
 find_path(${PKGNAME}_DATA
           NAMES MainProgramSettings.xml
@@ -31,6 +32,9 @@ if(${PKGNAME}_INCLUDE_DIR AND ${PKGNAME}_LIBRARY_SHARED AND ${PKGNAME}_DATA)
                         PROPERTIES IMPORTED_LOCATION
                                    ${${PKGNAME}_LIBRARY_SHARED}
                                    INTERFACE_INCLUDE_DIRECTORIES ${incdir})
+  # Promote the imported target to global visibility (so we can alias it)
+  set_target_properties(pythia PROPERTIES IMPORTED_GLOBAL TRUE)
+  add_library(MC::Pythia ALIAS pythia)
 endif()
 
 include(FindPackageHandleStandardArgs)
diff --git a/dependencies/Findpythia6.cmake b/dependencies/Findpythia6.cmake
@@ -20,12 +20,14 @@ if(${PKGNAME}_LIBRARY_SHARED)
   set_target_properties(pythia6
                         PROPERTIES IMPORTED_LOCATION
                                    ${${PKGNAME}_LIBRARY_SHARED})
+  # Promote the imported target to global visibility (so we can alias it)
+  set_target_properties(pythia6 PROPERTIES IMPORTED_GLOBAL TRUE)
+  add_library(MC::Pythia6 ALIAS pythia)
 endif()
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(
-  ${PKGNAME}
-  REQUIRED_VARS ${PKGNAME}_LIBRARY_SHARED)
+find_package_handle_standard_args(${PKGNAME}
+                                  REQUIRED_VARS ${PKGNAME}_LIBRARY_SHARED)
 
 mark_as_advanced(${PKGNAME}_LIBRARY_SHARED)
 
diff --git a/dependencies/O2Dependencies.cmake b/dependencies/O2Dependencies.cmake
@@ -36,7 +36,7 @@ include(FeatureSummary)
 
 include(FindThreads)
 
-find_package(arrow CONFIG)
+find_package(arrow MODULE)
 set_package_properties(arrow PROPERTIES TYPE REQUIRED)
 
 find_package(Vc)
@@ -116,7 +116,7 @@ find_package(benchmark CONFIG NAMES benchmark googlebenchmark)
 set_package_properties(benchmark PROPERTIES TYPE OPTIONAL)
 find_package(OpenMP)
 set_package_properties(OpenMP PROPERTIES TYPE OPTIONAL)
-find_package(GLFW NAMES glfw3 CONFIG)
+find_package(GLFW MODULE)
 set_package_properties(GLFW PROPERTIES TYPE RECOMMENDED)
 find_package(DebugGUI CONFIG)
 set_package_properties(DebugGUI PROPERTIES TYPE RECOMMENDED)
diff --git a/run/CMakeLists.txt b/run/CMakeLists.txt
@@ -36,34 +36,37 @@ target_link_libraries(allsim
                                 O2::ZDCSimulation
                                 O2::Generators)
 
+
+add_library(internal::allsim ALIAS allsim)
+
 o2_add_executable(device-runner
                   COMPONENT_NAME sim
                   SOURCES O2SimDeviceRunner.cxx
-                  PUBLIC_LINK_LIBRARIES allsim)
+                  PUBLIC_LINK_LIBRARIES internal::allsim)
 
 o2_add_executable(serial
                   COMPONENT_NAME sim
                   SOURCES o2sim.cxx
-                  PUBLIC_LINK_LIBRARIES allsim)
+                  PUBLIC_LINK_LIBRARIES internal::allsim)
 
 o2_add_executable(sim
                   SOURCES o2sim_parallel.cxx
-                  PUBLIC_LINK_LIBRARIES allsim O2::Framework)
+                  PUBLIC_LINK_LIBRARIES internal::allsim O2::Framework)
 
 o2_add_executable(primary-server-device-runner
                   COMPONENT_NAME sim
                   SOURCES O2PrimaryServerDeviceRunner.cxx
-                  PUBLIC_LINK_LIBRARIES allsim)
+                  PUBLIC_LINK_LIBRARIES internal::allsim)
 
 o2_add_executable(hit-merger-runner
                   COMPONENT_NAME sim
                   SOURCES O2HitMergerRunner.cxx
-                  PUBLIC_LINK_LIBRARIES allsim)
+                  PUBLIC_LINK_LIBRARIES internal::allsim)
 
 o2_add_executable(tpc
                   COMPONENT_NAME sim
                   SOURCES runTPC.cxx
-                  PUBLIC_LINK_LIBRARIES allsim O2::TPCReconstruction)
+                  PUBLIC_LINK_LIBRARIES internal::allsim O2::TPCReconstruction)
 
 o2_data_file(COPY o2simtopology.json DESTINATION config)
 
