Remove macro, improve documentation

Signed-off-by: Rémi Achard <remiachard@gmail.com>
AcademySoftwareFoundation · May 5, 2021 · 393a89a · 393a89a
1 parent b173d4e
commit 393a89a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 33 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -239,14 +239,6 @@ endif()
 include(FindExtPackages)
 
 
-###############################################################################
-# Target definition utilities
-# This includes the install_targets macro, to make target available for
-# import by external projects.
-
-include(TargetUtils)
-
-
 ###############################################################################
 # Progress to other sources
 
@@ -277,6 +269,8 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/${OCIO_SETUP_NAME} DESTINAT
 
 ###############################################################################
 # Generate OpenColorIO-config.cmake
+# Targets exported to ${PROJECT_NAME}_EXPORTED_TARGETS will be available for
+# import using find_package(OpenColorIO).
 
 include(CMakePackageConfigHelpers)
 

diff --git a/include/OpenColorIO/CMakeLists.txt b/include/OpenColorIO/CMakeLists.txt
@@ -27,4 +27,6 @@ list(APPEND core_export_headers ${CMAKE_CURRENT_BINARY_DIR}/OpenColorABI.h)
 install(FILES ${core_export_headers}
     DESTINATION include/OpenColorIO)
 
-install_targets(OpenColorIOHeaders)
+install(TARGETS OpenColorIOHeaders
+    EXPORT ${PROJECT_NAME}_EXPORTED_TARGETS
+)
diff --git a/share/cmake/macros/TargetUtils.cmake b/share/cmake/macros/TargetUtils.cmake
diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt
@@ -276,9 +276,8 @@ if(MSVC AND BUILD_SHARED_LIBS)
 endif()
 
 install(TARGETS OpenColorIO
+	EXPORT ${PROJECT_NAME}_EXPORTED_TARGETS
 	LIBRARY DESTINATION lib
 	RUNTIME DESTINATION bin
 	ARCHIVE DESTINATION lib
 )
-
-install_targets(OpenColorIO)