From 7d51469a2a6f7cb6ab090e5640dbf04cd36ebddb Mon Sep 17 00:00:00 2001 From: EndrII <EndrIIMail@gmail.com> Date: Sat, 20 Mar 2021 11:38:56 +0300 Subject: [PATCH] fix cmake --- CMake | 2 +- Deploy/{RENAME_ME.json => CQtDeployerServer.json} | 0 src/CMakeLists.txt | 2 +- src/Library/CMakeLists.txt | 2 +- src/{Example => Server}/CMakeLists.txt | 0 src/{Example => Server}/src/main.cpp | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename Deploy/{RENAME_ME.json => CQtDeployerServer.json} (100%) rename src/{Example => Server}/CMakeLists.txt (100%) rename src/{Example => Server}/src/main.cpp (100%) diff --git a/CMake b/CMake index 814b6ae..30b2e07 160000 --- a/CMake +++ b/CMake @@ -1 +1 @@ -Subproject commit 814b6aeb4ea5b3d9985aabe88af92b37f5aed5ad +Subproject commit 30b2e07c474ab032dd120475b0a2a4cca6012fe7 diff --git a/Deploy/RENAME_ME.json b/Deploy/CQtDeployerServer.json similarity index 100% rename from Deploy/RENAME_ME.json rename to Deploy/CQtDeployerServer.json diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4cb9d7e..bd71644 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -22,4 +22,4 @@ include(../CMake/Version.cmake) include(../CMake/tr.cmake) add_subdirectory(Library) -add_subdirectory(Example) +add_subdirectory(Server) diff --git a/src/Library/CMakeLists.txt b/src/Library/CMakeLists.txt index 869c538..2e4a83d 100644 --- a/src/Library/CMakeLists.txt +++ b/src/Library/CMakeLists.txt @@ -36,7 +36,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/Example/CMakeLists.txt b/src/Server/CMakeLists.txt similarity index 100% rename from src/Example/CMakeLists.txt rename to src/Server/CMakeLists.txt diff --git a/src/Example/src/main.cpp b/src/Server/src/main.cpp similarity index 100% rename from src/Example/src/main.cpp rename to src/Server/src/main.cpp