From 03a059f212e96485a5af3aadc092dd9ffd72469e Mon Sep 17 00:00:00 2001 From: EndrII Date: Sun, 4 Apr 2021 22:22:14 +0300 Subject: [PATCH] fix project structure. --- Deploy/{RENAME_ME.json => CopyrighFixer.json} | 0 src/CMakeLists.txt | 2 +- src/Example/CMakeLists.txt | 8 +++----- src/Example/{src => }/main.cpp | 0 src/Library/CMakeLists.txt | 12 +++++------- src/Library/{src => }/CopyrighFixer.qrc | 0 src/Library/{src => CopyrighFixer}/CopyrighFixer.cpp | 0 src/Library/{src => CopyrighFixer}/CopyrighFixer.h | 0 .../{src => CopyrighFixer}/CopyrighFixer_global.h | 0 .../{src => }/CopyrighFixerModule/CopyrighFixer.qml | 0 src/Library/{src => }/CopyrighFixerModule/qmldir | 0 11 files changed, 9 insertions(+), 13 deletions(-) rename Deploy/{RENAME_ME.json => CopyrighFixer.json} (100%) rename src/Example/{src => }/main.cpp (100%) rename src/Library/{src => }/CopyrighFixer.qrc (100%) rename src/Library/{src => CopyrighFixer}/CopyrighFixer.cpp (100%) rename src/Library/{src => CopyrighFixer}/CopyrighFixer.h (100%) rename src/Library/{src => CopyrighFixer}/CopyrighFixer_global.h (100%) rename src/Library/{src => }/CopyrighFixerModule/CopyrighFixer.qml (100%) rename src/Library/{src => }/CopyrighFixerModule/qmldir (100%) diff --git a/Deploy/RENAME_ME.json b/Deploy/CopyrighFixer.json similarity index 100% rename from Deploy/RENAME_ME.json rename to Deploy/CopyrighFixer.json diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4cb9d7e..156caf5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -19,7 +19,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) include(../CMake/ProjectOut.cmake) include(../CMake/Version.cmake) -include(../CMake/tr.cmake) +include(../CMake/QtUtils.cmake) add_subdirectory(Library) add_subdirectory(Example) diff --git a/src/Example/CMakeLists.txt b/src/Example/CMakeLists.txt index 79612d6..cb9f12c 100644 --- a/src/Example/CMakeLists.txt +++ b/src/Example/CMakeLists.txt @@ -15,18 +15,16 @@ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED) file(GLOB SOURCE_CPP "*.cpp" "*.qrc" - "src/*.cpp" "src/*.qrc" - "src/Private/*.cpp" "src/Private/*.qrc" + "Private/*.cpp" "Private/*.qrc" ) set(PUBLIC_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") -set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/src") -set(PRIVATE_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/Private") +set(PRIVATE_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Private") add_executable(${CURRENT_PROJECT} ${SOURCE_CPP}) if (${QT_VERSION_MAJOR}) - target_link_libraries(${CURRENT_PROJECT} PUBLIC Qt::Core) + target_link_libraries(${CURRENT_PROJECT} PUBLIC Qt${QT_VERSION_MAJOR}::Core) endif() target_link_libraries(${CURRENT_PROJECT} PUBLIC ${PROJECT_NAME}) diff --git a/src/Example/src/main.cpp b/src/Example/main.cpp similarity index 100% rename from src/Example/src/main.cpp rename to src/Example/main.cpp diff --git a/src/Library/CMakeLists.txt b/src/Library/CMakeLists.txt index 4c48daf..79461ef 100644 --- a/src/Library/CMakeLists.txt +++ b/src/Library/CMakeLists.txt @@ -14,20 +14,18 @@ find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED) file(GLOB SOURCE_CPP - "*.cpp" "*.qrc" - "src/*.cpp" "src/*.qrc" - "src/Private/*.cpp" "src/Private/*.qrc" + "CopyrighFixer/*.cpp" "CopyrighFixer/*.qrc" + "CopyrighFixer/Private/*.cpp" "CopyrighFixer/Private/*.qrc" ) set(PUBLIC_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") -set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/src") -set(PRIVATE_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/Private") +set(PRIVATE_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Private") add_library(${PROJECT_NAME} ${SOURCE_CPP}) if (${QT_VERSION_MAJOR}) - target_link_libraries(${PROJECT_NAME} PUBLIC Qt::Core) + target_link_libraries(${PROJECT_NAME} PUBLIC Qt${QT_VERSION_MAJOR}::Core) endif() target_include_directories(${PROJECT_NAME} PUBLIC ${PUBLIC_INCUDE_DIR}) @@ -36,7 +34,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${PRIVATE_INCUDE_DIR}) set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts) -prepareQM(${CMAKE_CURRENT_SOURCE_DIR} "${LANGS}") +prepareQM(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR} "${LANGS}") setVersion(0 0 1) diff --git a/src/Library/src/CopyrighFixer.qrc b/src/Library/CopyrighFixer.qrc similarity index 100% rename from src/Library/src/CopyrighFixer.qrc rename to src/Library/CopyrighFixer.qrc diff --git a/src/Library/src/CopyrighFixer.cpp b/src/Library/CopyrighFixer/CopyrighFixer.cpp similarity index 100% rename from src/Library/src/CopyrighFixer.cpp rename to src/Library/CopyrighFixer/CopyrighFixer.cpp diff --git a/src/Library/src/CopyrighFixer.h b/src/Library/CopyrighFixer/CopyrighFixer.h similarity index 100% rename from src/Library/src/CopyrighFixer.h rename to src/Library/CopyrighFixer/CopyrighFixer.h diff --git a/src/Library/src/CopyrighFixer_global.h b/src/Library/CopyrighFixer/CopyrighFixer_global.h similarity index 100% rename from src/Library/src/CopyrighFixer_global.h rename to src/Library/CopyrighFixer/CopyrighFixer_global.h diff --git a/src/Library/src/CopyrighFixerModule/CopyrighFixer.qml b/src/Library/CopyrighFixerModule/CopyrighFixer.qml similarity index 100% rename from src/Library/src/CopyrighFixerModule/CopyrighFixer.qml rename to src/Library/CopyrighFixerModule/CopyrighFixer.qml diff --git a/src/Library/src/CopyrighFixerModule/qmldir b/src/Library/CopyrighFixerModule/qmldir similarity index 100% rename from src/Library/src/CopyrighFixerModule/qmldir rename to src/Library/CopyrighFixerModule/qmldir