Skip to content
Snippets Groups Projects

chore(project-template): remove workaround for doocstiminglib

Merged Martin Christoph Hierholzer requested to merge update-project-template into master
1 file
+ 1
18
Compare changes
  • Side-by-side
  • Inline
@@ -82,8 +82,7 @@ function(expandDoocsComponentName longName shortName)
elseif (";${shortName};" MATCHES ";daqsndlib;")
set(${longName} "doocs-daqsndlib" PARENT_SCOPE)
elseif (";${shortName};" MATCHES ";timinglib;")
# we define it as alias to doocs-doocsapi and check additional requirements
set(${longName} "doocs-doocsapi" PARENT_SCOPE)
set(${longName} "doocs-doocstiminglib" PARENT_SCOPE)
else()
set(${longName} "${shortName}" PARENT_SCOPE)
endif()
@@ -165,22 +164,6 @@ foreach(component ${DOOCS_FIND_COMPONENTS})
message(FATAL_ERROR "DOOCS component ${component} not found!")
endif()
endif()
if(${component} STREQUAL "timinglib")
# Find doocs/TimingWord.h from dev-doocs-doocstiminglib
# which unfortunately does not provide pkgconfig
find_path(DOOCS_timingLib_INCLUDE_DIRS doocs/TimingWord.h REQUIRED PATHS ${DOOCS_api_INCLUDE_DIRS})
if (NOT DOOCS_timingLib_INCLUDE_DIRS)
message(FATAL_ERROR "FindDOOCS: Failed to find TimingWord.h")
set(DOOCS_timingLib_FOUND FALSE)
else()
if (NOT DOOCS_FIND_QUIETLY)
message(STATUS "FindDOOCS: Found timinglib, include dirs: ${DOOCS_timingLib_INCLUDE_DIRS}")
endif()
set(DOOCS_timingLib_FOUND TRUE)
# include dir is always same as for api component, so alias is sufficient
add_library(DOOCS::${component} ALIAS PkgConfig::DOOCS_api)
endif()
endif()
endforeach()
#message(DEBUG "complete list of searched components: ${DOOCS_FIND_COMPONENTS_ALL}")
Loading