FIXed CMake build:generic ALIAS targets were defined incorrectly

jkriege2 · Jan 22, 2024 · 397d2be · 397d2be
1 parent ab8ab57
commit 397d2be
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/cmake/jkqtplotter_macros.cmake b/cmake/jkqtplotter_macros.cmake
@@ -101,6 +101,7 @@ function(jkqtplotter_installlibrary_new lib_name libIncludeSubdir libSrcDir)
     )
     # generate ...Config.cmake
     set(JKQTP_CURRENT_TARGET_FILENAME "${lib_name}Targets.cmake")
+    set(libBasename "${libIncludeSubdir}")
     configure_file(${libSrcDir}/LibTarget.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/${lib_name}Config.cmake" @ONLY)
     # install export files
     install(EXPORT ${lib_name}_TARGETS

diff --git a/lib/jkqtcommon/LibTarget.cmake.in b/lib/jkqtcommon/LibTarget.cmake.in
@@ -13,5 +13,5 @@ find_package(Qt@QT_VERSION_MAJOR@ COMPONENTS Core Gui Widgets Xml REQUIRED)
 include("${CMAKE_CURRENT_LIST_DIR}/@JKQTP_CURRENT_TARGET_FILENAME@")
 
 if(NOT TARGET JKQTPlotter::@libBasename@)
-  add_library(JKQTPlotter::@libBasename@ ALIAS JKQTPlotter@QT_VERSION_MAJOR@@libBasename@
+  add_library(JKQTPlotter::@libBasename@ ALIAS JKQTPlotter@QT_VERSION_MAJOR@::@lib_name@
 endif()
diff --git a/lib/jkqtfastplotter/LibTarget.cmake.in b/lib/jkqtfastplotter/LibTarget.cmake.in
@@ -17,5 +17,5 @@ find_package(JKQTCommon@jkqtplotter_LIBNAME_VERSION_PART@ REQUIRED PATHS ${CMAKE
 include("${CMAKE_CURRENT_LIST_DIR}/@JKQTP_CURRENT_TARGET_FILENAME@")
 
 if(NOT TARGET JKQTPlotter::@libBasename@)
-  add_library(JKQTPlotter::@libBasename@ ALIAS JKQTPlotter@QT_VERSION_MAJOR@@libBasename@
+  add_library(JKQTPlotter::@libBasename@ ALIAS JKQTPlotter@QT_VERSION_MAJOR@::@lib_name@
 endif()
diff --git a/lib/jkqtmath/LibTarget.cmake.in b/lib/jkqtmath/LibTarget.cmake.in
@@ -15,5 +15,5 @@ include("${CMAKE_CURRENT_LIST_DIR}/@JKQTP_CURRENT_TARGET_FILENAME@")
 
 
 if(NOT TARGET JKQTPlotter::@libBasename@)
-  add_library(JKQTPlotter::@libBasename@ ALIAS JKQTPlotter@QT_VERSION_MAJOR@@libBasename@
+  add_library(JKQTPlotter::@libBasename@ ALIAS JKQTPlotter@QT_VERSION_MAJOR@::@lib_name@
 endif()
diff --git a/lib/jkqtmathtext/LibTarget.cmake.in b/lib/jkqtmathtext/LibTarget.cmake.in
@@ -16,5 +16,5 @@ include("${CMAKE_CURRENT_LIST_DIR}/@JKQTP_CURRENT_TARGET_FILENAME@")
 
 
 if(NOT TARGET JKQTPlotter::@libBasename@)
-  add_library(JKQTPlotter::@libBasename@ ALIAS JKQTPlotter@QT_VERSION_MAJOR@@libBasename@
+  add_library(JKQTPlotter::@libBasename@ ALIAS JKQTPlotter@QT_VERSION_MAJOR@::@lib_name@
 endif()
diff --git a/lib/jkqtplotter/LibTarget.cmake.in b/lib/jkqtplotter/LibTarget.cmake.in
@@ -16,5 +16,5 @@ include("${CMAKE_CURRENT_LIST_DIR}/@JKQTP_CURRENT_TARGET_FILENAME@")
 
 
 if(NOT TARGET JKQTPlotter::@libBasename@)
-  add_library(JKQTPlotter::@libBasename@ ALIAS JKQTPlotter@QT_VERSION_MAJOR@@libBasename@
+  add_library(JKQTPlotter::@libBasename@ ALIAS JKQTPlotter@QT_VERSION_MAJOR@::@lib_name@
 endif()