SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

1. 不设置CMAKE_BUILD_TYPE，便于调试。

Browse Source 
2. 添加缺失的Qt5::WinExtras包。
3. 修复资源文件applogo.rc路径错误。
This commit is contained in:
victor
2022-10-05 13:05:32 +08:00
parent b964f8a703
commit 190c45da3e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -181,11 +181,12 @@ find_package(Qt5Core QUIET)
if(Qt5Core_FOUND)
message("----- Qt5:")
message(STATUS " includes:" ${Qt5Core_INCLUDE_DIRS})
find_package(Qt5WinExtras REQUIRED)
find_package(Qt5Widgets REQUIRED)
find_package(Qt5Gui REQUIRED)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
set(QT_INCLUDE_DIRS ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS})
set(QT_LIBRARIES Qt5::Gui Qt5::Widgets)
set(QT_INCLUDE_DIRS ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5WinExtras_INCLUDE_DIRS})
set(QT_LIBRARIES Qt5::Gui Qt5::Widgets Qt5::WinExtras)
add_definitions(${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS})
else()
find_package(Qt6Core QUIET)
@@ -548,7 +549,7 @@ if(WIN32)
set(CMAKE_RC_COMPILE_OBJECT "${CMAKE_RC_COMPILER} -O coff -I${CMAKE_CURRENT_SOURCE_DIR} <SOURCE> <OBJECT>")
enable_language(RC)
# app icon
list(APPEND DSView_SOURCES DSView/applogo.rc)
list(APPEND DSView_SOURCES applogo.rc)
endif()
if(Qt5Core_FOUND)
@@ -593,7 +594,7 @@ endif()
#= Release flags
#-------------------------------------------------------------------------------
set(CMAKE_CXX_FLAGS "-Wall -Wextra")
set(CMAKE_BUILD_TYPE Release)
#set(CMAKE_BUILD_TYPE Release)
set(CMAKE_CXX_FLAGS_DEBUG "-g")
set(CMAKE_CXX_FLAGS_RELEASE "-O3")
add_compile_options(-O3)