added icon to final exe!

added flag to gtest
Niakr1s · Nov 23, 2019 · e5ef978 · e5ef978
1 parent 3ef2238
commit e5ef978
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_FLAGS "-mwindows")
 
 project(rrt LANGUAGES CXX VERSION 0.1.0)
 
@@ -11,8 +12,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/a")
-
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/a")
 
 configure_file(src/version.h.in ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/version.h)
 
@@ -36,4 +36,7 @@ add_subdirectory(libs/libdxfrw)
 add_subdirectory(libs/sqlite)
 
 add_subdirectory(src)
+
+if (ENABLE_TESTS)
 add_subdirectory(tests)
+endif()
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -47,6 +47,7 @@ endif()
 add_executable(rrt
     ${SRC}
     ${QM_FILES}
+    resources/rrt.o
 )
 
 target_link_libraries(rrt

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
@@ -17,7 +17,7 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent) {
   auto updater = new Updater();
   updater->startUpdateQuery();
 
-  setWindowIcon(QIcon(":/icons/rrt.png"));
+  setWindowIcon(QIcon(":/icons/rrt.ico"));
   setWindowTitle("Rosreestr Tools");
 
   mainWidget_ = new MainWidget();

diff --git a/src/gui/resources/resources.qrc b/src/gui/resources/resources.qrc
@@ -12,5 +12,6 @@
         <file>newline.png</file>
         <file>semicolon.png</file>
         <file>database.svg</file>
+        <file>rrt.ico</file>
     </qresource>
 </RCC>
diff --git a/src/gui/resources/rrt.ico b/src/gui/resources/rrt.ico