Explorar el Código

Remove redundant cmake config template

- fixed misprint in grpc cmake-config install path
Viktor Kopp hace 5 años
padre
commit
623c162c15

+ 2 - 2
src/grpc/CMakeLists.txt

@@ -5,7 +5,7 @@ set(TARGET_CONFIG ${TARGET}Config)
 
 set(TARGET_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}/${TARGET})
 set(TARGET_LIB_DIR ${CMAKE_INSTALL_LIBDIR})
-set(TARGET_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET}})
+set(TARGET_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET})
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
@@ -55,7 +55,7 @@ configure_package_config_file(
     "${TARGET_CONFIG}.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_CMAKE_DIR}/${TARGET_CONFIG}.cmake"
     INSTALL_DESTINATION "${TARGET_CMAKE_DIR}")
 configure_package_config_file(
-    "${TARGET_CONFIG}Tree.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_CONFIG}.cmake"
+    "${TARGET_CONFIG}.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_CONFIG}.cmake"
     INSTALL_DESTINATION "${TARGET_CMAKE_DIR}")
 
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_CMAKE_DIR}/${TARGET_CONFIG}.cmake" DESTINATION "${TARGET_CMAKE_DIR}")

+ 3 - 1
src/grpc/QtGrpcConfig.cmake.in

@@ -2,7 +2,9 @@ include(CMakeFindDependencyMacro)
 
 find_dependency(QtProtobuf REQUIRED CONFIG)
 
-include("${CMAKE_CURRENT_LIST_DIR}/@TARGET_EXPORT@.cmake")
+if (NOT TARGET @TARGET@ AND NOT @TARGET@_BINARY_DIR)
+    include("${CMAKE_CURRENT_LIST_DIR}/@TARGET_EXPORT@.cmake")
+endif()
 
 @PACKAGE_INIT@
 

+ 0 - 6
src/grpc/QtGrpcConfigTree.cmake.in

@@ -1,6 +0,0 @@
-include(CMakeFindDependencyMacro)
-
-find_dependency(QtProtobuf REQUIRED CONFIG)
-
-@PACKAGE_INIT@
-

+ 1 - 1
src/protobuf/CMakeLists.txt

@@ -55,7 +55,7 @@ configure_package_config_file(
     "${TARGET_CONFIG}.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_CMAKE_DIR}/${TARGET_CONFIG}.cmake"
     INSTALL_DESTINATION "${TARGET_CMAKE_DIR}")
 configure_package_config_file(
-    "${TARGET_CONFIG}Tree.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_CONFIG}.cmake"
+    "${TARGET_CONFIG}.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_CONFIG}.cmake"
     INSTALL_DESTINATION "${TARGET_CMAKE_DIR}")
 
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_CMAKE_DIR}/${TARGET_CONFIG}.cmake" DESTINATION "${TARGET_CMAKE_DIR}")

+ 3 - 1
src/protobuf/QtProtobufConfig.cmake.in

@@ -1,6 +1,8 @@
 include("${CMAKE_CURRENT_LIST_DIR}/ProtobufLookup.cmake")
 
-include("${CMAKE_CURRENT_LIST_DIR}/@TARGET_EXPORT@.cmake")
+if (NOT TARGET @TARGET@ AND NOT @TARGET@_BINARY_DIR)
+    include("${CMAKE_CURRENT_LIST_DIR}/@TARGET_EXPORT@.cmake")
+endif()
 
 @PACKAGE_INIT@
 

+ 0 - 5
src/protobuf/QtProtobufConfigTree.cmake.in

@@ -1,5 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/ProtobufLookup.cmake")
-
-@PACKAGE_INIT@
-
-include("${CMAKE_CURRENT_LIST_DIR}/QtProtobufGen.cmake")