diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f141d7..3c97a20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,10 +13,10 @@ find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets) set(PROJECT_SOURCES - main.cpp - snigdhaosblackbox.cpp - snigdhaosblackbox.h - snigdhaosblackbox.ui + qt/main.cpp + qt/snigdhaosblackbox.cpp + qt/snigdhaosblackbox.h + qt/snigdhaosblackbox.ui ) if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) @@ -28,41 +28,48 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) # set_property(TARGET SnigdhaOSBlackbox 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(SnigdhaOSBlackbox SHARED - ${PROJECT_SOURCES} - ) +# else() +# if(ANDROID) +# add_library(SnigdhaOSBlackbox 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(SnigdhaOSBlackbox - ${PROJECT_SOURCES} - ) - endif() +# else() +# add_executable(SnigdhaOSBlackbox +# ${PROJECT_SOURCES} +# ) +# endif() +# endif() + +else() + add_executable(SnigdhaOSBlackbox + ${PROJECT_SOURCES} + ) endif() -target_link_libraries(SnigdhaOSBlackbox PRIVATE Qt${QT_VERSION_MAJOR}::Widgets) + +target_link_libraries(SnigdhaOSBlackbox PRIVATE Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Network) # 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.SnigdhaOSBlackbox) -endif() -set_target_properties(SnigdhaOSBlackbox 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.SnigdhaOSBlackbox) +# endif() +# set_target_properties(SnigdhaOSBlackbox 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 SnigdhaOSBlackbox BUNDLE DESTINATION . LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + # RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) if(QT_VERSION_MAJOR EQUAL 6)