File 0000-fix-executable-name.patch of Package libASqlQt5

Overview Repositories Revisions Requests Users Attributes Meta

File 0000-fix-executable-name.patch of Package libASqlQt5 (Revision 41c136ec4af47d5689a11b9c2e1458d5)

Currently displaying revision 41c136ec4af47d5689a11b9c2e1458d5 , Show latest

From 2b600cc31267dd8be10b114c54fba7cf130cf5c3 Mon Sep 17 00:00:00 2001
From: Daniel Nicoletti <dantti12@gmail.com>
Date: Sun, 11 Jul 2021 10:54:46 -0300
Subject: [PATCH] Fixes asql-migration executable name

FIXES: #5
---
 CMakeLists.txt     | 16 ++++++++--------
 src/CMakeLists.txt | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d05b3d..48996bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,22 +90,22 @@ include_directories(
 
 # cmake config files
 configure_file(${CMAKE_MODULE_PATH}/asqlqt5-config.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/ASqlQt5Config.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/ASqlQt${QT_VERSION_MAJOR}Config.cmake
     @ONLY
 )
 configure_file(${CMAKE_MODULE_PATH}/asqlqt5-config-version.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/ASqlQt5ConfigVersion.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/ASqlQt${QT_VERSION_MAJOR}ConfigVersion.cmake
     @ONLY
 )
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ASqlQt5Config.cmake
-    ${CMAKE_CURRENT_BINARY_DIR}/ASqlQt5ConfigVersion.cmake
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ASqlQt5/
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ASqlQt${QT_VERSION_MAJOR}Config.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/ASqlQt${QT_VERSION_MAJOR}ConfigVersion.cmake
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ASqlQt${QT_VERSION_MAJOR}/
 )
 
 install(EXPORT ASqlTargets
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ASqlQt5/
-    FILE ASql${PROJECT_VERSION_MAJOR}Qt5Targets.cmake
-    NAMESPACE ASqlQt5::
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ASqlQt${QT_VERSION_MAJOR}/
+    FILE ASql${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}Targets.cmake
+    NAMESPACE ASqlQt${QT_VERSION_MAJOR}::
     COMPONENT Devel
 )
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4fbec1c..b97a8a2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -79,17 +79,17 @@ install(TARGETS ASqlQt${QT_VERSION_MAJOR}
 )
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/asql-qt5.pc.in
-  ${CMAKE_CURRENT_BINARY_DIR}/ASqlQt5.pc
+  ${CMAKE_CURRENT_BINARY_DIR}/ASqlQt${QT_VERSION_MAJOR}.pc
   @ONLY
 )
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ASqlQt5.pc
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ASqlQt${QT_VERSION_MAJOR}.pc
         DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
 )
 
-add_executable(asql-migration asql_migration.cpp)
-target_link_libraries(asql-migration
+add_executable(asql-migration${PROJECT_VERSION_MAJOR}-qt${QT_VERSION_MAJOR} asql_migration.cpp)
+target_link_libraries(asql-migration${PROJECT_VERSION_MAJOR}-qt${QT_VERSION_MAJOR}
     PUBLIC
         Qt${QT_VERSION_MAJOR}::Core
         ASqlQt${QT_VERSION_MAJOR}::Core
 )
-install(TARGETS asql-migration DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(TARGETS asql-migration${PROJECT_VERSION_MAJOR}-qt${QT_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})

Places

File 0000-fix-executable-name.patch of Package libASqlQt5 (Revision 41c136ec4af47d5689a11b9c2e1458d5)

Places