[afterimage,lz4] encapsulate builtin dependency behind CMake target

builtins/freetype/CMakeLists.txt

@@ -69,6 +69,7 @@ set_target_properties(Freetype::Freetype PROPERTIES
     IMPORTED_LINK_INTERFACE_LANGUAGES "C"
     IMPORTED_LOCATION "${FREETYPE_LIBRARY}"
     INTERFACE_INCLUDE_DIRECTORIES "${incdir}")
+add_dependencies(Freetype::Freetype BUILTIN_FREETYPE)
 
 if(builtin_zlib)
     add_dependencies(BUILTIN_FREETYPE BUILTIN_ZLIB)

builtins/libgif/CMakeLists.txt

@@ -49,6 +49,7 @@ set_target_properties(GIF::GIF PROPERTIES
     IMPORTED_LOCATION ${ROOT_LIBGIF_LIBRARY}
     INTERFACE_INCLUDE_DIRECTORIES ${ROOT_LIBGIF_PREFIX}/include
 )
+add_dependencies(GIF::GIF BUILTIN_LIBGIF)
 
 # Set the canonical output of find_package according to
 # https://cmake.org/cmake/help/latest/manual/cmake-developer.7.html#standard-variable-names

builtins/libjpeg/CMakeLists.txt

@@ -57,6 +57,7 @@ set_target_properties(JPEG::JPEG PROPERTIES
     IMPORTED_LOCATION ${ROOT_LIBJPEG_LIBRARY}
     INTERFACE_INCLUDE_DIRECTORIES ${ROOT_LIBJPEG_PREFIX}/include
 )
+add_dependencies(JPEG::JPEG BUILTIN_LIBJPEG)
 
 # Set the canonical output of find_package according to
 # https://cmake.org/cmake/help/latest/manual/cmake-developer.7.html#standard-variable-names

builtins/libpng/CMakeLists.txt

@@ -72,6 +72,7 @@ set_target_properties(PNG::PNG PROPERTIES
     IMPORTED_LOCATION ${ROOT_LIBPNG_LIBRARY}
     INTERFACE_INCLUDE_DIRECTORIES ${ROOT_LIBPNG_PREFIX}/include
 )
+add_dependencies(PNG::PNG BUILTIN_LIBPNG)
 
 if(builtin_zlib)
     add_dependencies(BUILTIN_LIBPNG BUILTIN_ZLIB)

builtins/lz4/CMakeLists.txt

@@ -11,10 +11,7 @@ set(ROOT_LZ4_HASH "537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f
 
 project(LZ4 C)
 
-set(LZ4_VERSION ${ROOT_LZ4_VERSION} CACHE INTERNAL "" FORCE) # used in roottest
-
 set(ROOT_LZ4_PREFIX ${CMAKE_BINARY_DIR}/builtins/LZ4-prefix)
-
 set(ROOT_LZ4_LIBRARY ${ROOT_LZ4_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}lz4${CMAKE_STATIC_LIBRARY_SUFFIX})
 
 if(MSVC)
@@ -58,17 +55,17 @@ ExternalProject_Add(
 )
 
 
-set(LIBLZ4_INCLUDE_DIR ${ROOT_LZ4_PREFIX}/include)
-file(MAKE_DIRECTORY ${LIBLZ4_INCLUDE_DIR})
+set(LZ4_INCLUDE_DIR ${ROOT_LZ4_PREFIX}/include)
+file(MAKE_DIRECTORY ${LZ4_INCLUDE_DIR})
 
-add_library(LibLZ4 STATIC IMPORTED GLOBAL)
-add_library(LZ4::LZ4 ALIAS LibLZ4)
-target_include_directories(LibLZ4 INTERFACE ${LIBLZ4_INCLUDE_DIR})
-set_target_properties(LibLZ4 PROPERTIES IMPORTED_LOCATION ${ROOT_LZ4_LIBRARY})
+add_library(LZ4::LZ4 STATIC IMPORTED GLOBAL)
+add_dependencies(LZ4::LZ4 BUILTIN_LZ4)
+target_include_directories(LZ4::LZ4 INTERFACE ${LZ4_INCLUDE_DIR})
+set_target_properties(LZ4::LZ4 PROPERTIES IMPORTED_LOCATION ${ROOT_LZ4_LIBRARY})
 
 # Set the canonical output of find_package according to
 # https://cmake.org/cmake/help/latest/manual/cmake-developer.7.html#standard-variable-names
-set(LZ4_INCLUDE_DIRS ${LIBLZ4_INCLUDE_DIR} PARENT_SCOPE)
+set(LZ4_INCLUDE_DIRS ${LZ4_INCLUDE_DIR} PARENT_SCOPE)
 set(LZ4_LIBRARIES ${ROOT_LZ4_LIBRARY} PARENT_SCOPE)
 set(LZ4_FOUND TRUE PARENT_SCOPE)
 set(LZ4_VERSION ${ROOT_LZ4_VERSION} PARENT_SCOPE)

core/lz4/CMakeLists.txt

@@ -4,13 +4,8 @@
 # For the licensing terms see $ROOTSYS/LICENSE.
 # For the list of contributors see $ROOTSYS/README/CREDITS.
 
-find_package(LZ4 REQUIRED)
 find_package(xxHash REQUIRED)
 
-if(builtin_lz4)
-    add_dependencies(Core BUILTIN_LZ4)
-endif()
-
 target_sources(Core PRIVATE src/ZipLZ4.cxx)
 target_link_libraries(Core PRIVATE xxHash::xxHash LZ4::LZ4)
 target_include_directories(Core PUBLIC

graf2d/asimage/src/libAfterImage/CMakeLists.txt

@@ -59,18 +59,7 @@ set(SRC_FILES
 add_library(${LIB_NAME} STATIC ${H_FILES} ${SRC_FILES})
 set_property(TARGET ${LIB_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON)
 
-if(TARGET BUILTIN_LIBGIF)
-  add_dependencies(${LIB_NAME} BUILTIN_LIBGIF)
-endif()
-if(TARGET BUILTIN_LIBJPEG)
-  add_dependencies(${LIB_NAME} BUILTIN_LIBJPEG)
-endif()
-if(TARGET BUILTIN_LIBPNG)
-  add_dependencies(${LIB_NAME} BUILTIN_LIBPNG)
-endif()
-if(TARGET BUILTIN_FREETYPE)
-  add_dependencies(${LIB_NAME} BUILTIN_FREETYPE)
-endif()
+# ASEXTRA_LIBRARIES: PNG::PNG JPEG::JPEG GIF::GIF
 
 target_include_directories(${LIB_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(${LIB_NAME} PRIVATE ${ASEXTRA_LIBRARIES} Freetype::Freetype ZLIB::ZLIB)