Merge pull request #9 from art-daq/eflumerf/RemoveUPS

Remove UPS configurations, use Spack-style package name

Author: eflumerf

CMakeLists.txt

@@ -1,5 +1,5 @@
 # ======================================================================
-#  artdaq_core_demo main build file
+#  artdaq-core-demo main build file
 #
 #  cd .../path/to/build/directory
 #  source .../path/to/artdaq-demo/ups/setup_for_development
@@ -10,7 +10,7 @@ cmake_minimum_required (VERSION 3.19)
 
 find_package(cetmodules 3.08.00 REQUIRED)
 
-project(artdaq_core_demo VERSION 1.12.00)
+project(artdaq-core-demo VERSION 1.12.00)
 
 include(CetCMakeEnv)
 cet_cmake_env()
@@ -54,7 +54,7 @@ endif()
 
 #cet_report_compiler_flags()
 
-find_package(artdaq_core 3.08.04 REQUIRED)
+find_package(artdaq-core 3.08.04 REQUIRED)
 
 # source
 add_subdirectory(artdaq-core-demo)

CMakePresets.json

@@ -23,7 +23,7 @@ configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/GetPackageBuildInfo.cc.in
 
 cet_make_library( LIBRARY_NAME artdaq-core-demo_BuildInfo
                   SOURCE  ${CMAKE_CURRENT_BINARY_DIR}/GetPackageBuildInfo.cc
-				  LIBRARIES artdaq_core::artdaq-core_Data
+				  LIBRARIES artdaq-core::Data
                  )
 
 install_headers()

artdaq-core-demo/BuildInfo/CMakeLists.txt

@@ -5,14 +5,14 @@ FragmentType.cc
 ToyFragment.cc
 UDPFragment.cc
 LIBRARIES PUBLIC
-  artdaq_core::artdaq-core_Utilities
-  artdaq_core::artdaq-core_Data
+  artdaq-core::Utilities
+  artdaq-core::Data
   TRACE::TRACE
   )
 
 
 include(ArtdaqCorePlugins)
-cet_build_plugin(ArtdaqDemo artdaq::fragmentNameHelper LIBRARIES REG artdaq_core_demo::artdaq-core-demo_Overlays)
+cet_build_plugin(ArtdaqDemo artdaq::fragmentNameHelper LIBRARIES REG artdaq-core-demo::Overlays)
 
 
 install_headers()

artdaq-core-demo/Overlays/CMakeLists.txt

@@ -24,7 +24,8 @@ if(DOXYGEN_FOUND)
 	set(EXCLUDE_FILES "")
 	if(CM_EXCLUDE)
 		foreach(file ${CM_EXCLUDE})
-			set(EXCLUDE_FILES "${EXCLUDE_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/${file}")
+			file(REAL_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../${file} file_abs)
+			set(EXCLUDE_FILES "${EXCLUDE_FILES} ${file_abs}")
 		endforeach()
 	endif()
 
@@ -34,8 +35,10 @@ if(DOXYGEN_FOUND)
 
 	if(CM_DEPENDS)
 		foreach(dependency ${CM_DEPENDS})
-			if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../../${dependency})
-				set(TAG_FILES "${TAG_FILES} ${CMAKE_BINARY_DIR}/${dependency}/doc/${dependency}.tag=../../${dependency}/")
+			if(TARGET ${dependency}_doc)
+				get_target_property(tag_source ${dependency}_doc SOURCE_DIR)
+				file(RELATIVE_PATH tag_dir ${CMAKE_CURRENT_SOURCE_DIR}/.. ${tag_source}/../ )
+				set(TAG_FILES "${TAG_FILES} ${CMAKE_BINARY_DIR}/${dependency}/doc/${dependency}.tag=${tag_dir}")
 				add_dependencies(${PROJECT_NAME}_doc ${dependency}_doc)
 			else()
 				string(TOUPPER ${dependency} dependency_uc)
@@ -45,6 +48,7 @@ if(DOXYGEN_FOUND)
 	endif()
 
 	string(REPLACE ";" " " DOXYGEN_INCLUDE_PATH "${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}")
+	file(REAL_PATH ${PROJECT_SOURCE_DIR}/.. DOXYGEN_STRIP_FROM_PATH)
 
 	configure_file(${DOXYFILE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
 	configure_file(${DOXYFILE_DIR}/header.html.in ${CMAKE_CURRENT_BINARY_DIR}/header.html @ONLY)
@@ -60,4 +64,4 @@ if(DOXYGEN_FOUND)
 endif(DOXYGEN_FOUND)
 endmacro()
 
-create_doxygen_documentation()
+create_doxygen_documentation(DEPENDS artdaq-core)

doc/CMakeLists.txt

@@ -152,7 +152,7 @@ FULL_PATH_NAMES        = YES
 # will be relative from the directory where doxygen is started.
 # This tag requires that the tag FULL_PATH_NAMES is set to YES.
 
-STRIP_FROM_PATH        = @PROJECT_SOURCE_DIR@/..
+STRIP_FROM_PATH        = @DOXYGEN_STRIP_FROM_PATH@
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
 # path mentioned in the documentation of a class, which tells the reader which