From c0a9e08311c0c596ee05bfec678c3c0c27be6871 Mon Sep 17 00:00:00 2001 From: "Eshan Roy (Eshanized)" Date: Tue, 30 Apr 2024 23:42:43 +0530 Subject: [PATCH] fix: cmake scr --- CMakeLists.txt | 52 ++++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ef25d7c..4b3f05b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,18 +30,24 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) # set_property(TARGET snigdhaos-assistant APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR # ${CMAKE_CURRENT_SOURCE_DIR}/android) # For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation +# else() +# if(ANDROID) +# add_library(snigdhaos-assistant SHARED +# ${PROJECT_SOURCES} +# ) +# # Define properties for Android with Qt 5 after find_package() calls as: +# # set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android") +# else() +# add_executable(snigdhaos-assistant +# ${PROJECT_SOURCES} +# ) +# endif() +# endif() + else() - if(ANDROID) - add_library(snigdhaos-assistant SHARED - ${PROJECT_SOURCES} - ) -# Define properties for Android with Qt 5 after find_package() calls as: -# set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android") - else() - add_executable(snigdhaos-assistant - ${PROJECT_SOURCES} - ) - endif() + add_executable(snigdhaos-assistant + ${PROJECT_SOURCES} + ) endif() target_link_libraries(snigdhaos-assistant PRIVATE Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Network) @@ -49,22 +55,22 @@ target_link_libraries(snigdhaos-assistant PRIVATE Qt${QT_VERSION_MAJOR}::Widgets # Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1. # If you are developing for iOS or macOS you should consider setting an # explicit, fixed bundle identifier manually though. -if(${QT_VERSION} VERSION_LESS 6.1.0) - set(BUNDLE_ID_OPTION MACOSX_BUNDLE_GUI_IDENTIFIER com.example.snigdhaos-assistant) -endif() -set_target_properties(snigdhaos-assistant PROPERTIES - ${BUNDLE_ID_OPTION} - MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} - MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} - MACOSX_BUNDLE TRUE - WIN32_EXECUTABLE TRUE -) +# if(${QT_VERSION} VERSION_LESS 6.1.0) +# set(BUNDLE_ID_OPTION MACOSX_BUNDLE_GUI_IDENTIFIER com.example.snigdhaos-assistant) +# endif() +# set_target_properties(snigdhaos-assistant PROPERTIES +# ${BUNDLE_ID_OPTION} +# MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} +# MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} +# MACOSX_BUNDLE TRUE +# WIN32_EXECUTABLE TRUE +# ) -include(GNUInstallDirs) +# include(GNUInstallDirs) install(TARGETS snigdhaos-assistant BUNDLE DESTINATION . LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + # RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) if(QT_VERSION_MAJOR EQUAL 6)