Browse Source

Merge pull request #475 from paullouisageneau/cmake-target-alias

CMake: Add retro-compatibility target alias and fix config file destination
Paul-Louis Ageneau 3 years ago
parent
commit
cca2c37416
2 changed files with 18 additions and 5 deletions
  1. 13 5
      CMakeLists.txt
  2. 5 0
      cmake/LibDataChannelConfig.cmake

+ 13 - 5
CMakeLists.txt

@@ -372,7 +372,7 @@ if(WARNINGS_AS_ERRORS)
 	endif()
 endif()
 
-install(TARGETS datachannel EXPORT LibDataChannelConfig
+install(TARGETS datachannel EXPORT LibDataChannelTargets
 	RUNTIME DESTINATION bin
 	LIBRARY DESTINATION lib
 	ARCHIVE DESTINATION lib
@@ -382,20 +382,28 @@ install(FILES ${LIBDATACHANNEL_HEADERS}
 	DESTINATION include/rtc
 )
 
+# Export targets
 install(
-	EXPORT LibDataChannelConfig
-	FILE LibDataChannelConfig.cmake
+	EXPORT LibDataChannelTargets
+	FILE LibDataChannelTargets.cmake
 	NAMESPACE LibDataChannel::
-	DESTINATION share/cmake/LibDataChannel
+	DESTINATION lib/cmake/LibDataChannel
 )
 
+# Export config
+install(
+	FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/LibDataChannelConfig.cmake
+	DESTINATION lib/cmake/LibDataChannel
+)
+
+# Export config version
 include(CMakePackageConfigHelpers)
 write_basic_package_version_file(
 	${CMAKE_BINARY_DIR}/LibDataChannelConfigVersion.cmake
 	VERSION ${PROJECT_VERSION}
 	COMPATIBILITY SameMajorVersion)
 install(FILES ${CMAKE_BINARY_DIR}/LibDataChannelConfigVersion.cmake
-	DESTINATION share/cmake/LibDataChannel)
+	DESTINATION lib/cmake/LibDataChannel)
 
 # Tests
 if(NOT NO_TESTS)

+ 5 - 0
cmake/LibDataChannelConfig.cmake

@@ -0,0 +1,5 @@
+include("${CMAKE_CURRENT_LIST_DIR}/LibDataChannelTargets.cmake")
+
+# For forward compatibility
+add_library(LibDataChannel::datachannel ALIAS LibDataChannel::LibDataChannel)
+