Skip to content

Commit e1d0aee

Browse files
committed
Update core
1 parent d26dd0b commit e1d0aee

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

.gitattributes

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
* text=auto eol=lf
2+
*.{cmd,[cC][mM][dD]} text eol=crlf
3+
*.{bat,[bB][aA][tT]} text eol=crlf

CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,12 @@ endif()
7171

7272
if (OS_WINDOWS)
7373
add_link_options(/DEBUG)
74+
else()
75+
add_compile_options(-g)
76+
add_compile_options(
77+
"$<$<CONFIG:DEBUG>:-O0>"
78+
"$<$<CONFIG:RELEASE>:-O3>"
79+
)
7480
endif()
7581

7682
if (OS_MACOS)

CefViewCore

test/QCefViewTest/CMakeLists.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
cmake_minimum_required(VERSION 3.4.1)
22
project(QCefViewTest)
33

4+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
45
set(CMAKE_AUTOMOC ON)
56
set(CMAKE_AUTOUIC ON)
67
set(CMAKE_AUTORCC ON)
78

8-
set(CMAKE_INCLUDE_CURRENT_DIR ON)
99
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Gui Widgets REQUIRED)
1010
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Widgets REQUIRED)
1111

@@ -81,7 +81,6 @@ endif() # OS_WINDOWS
8181
if (OS_LINUX)
8282
file(GLOB_RECURSE _RES_FILES
8383
"*.qrc"
84-
"*.rc"
8584
)
8685
source_group("Resource Files" ${_RES_FILES})
8786

@@ -135,9 +134,10 @@ if (OS_MACOS)
135134
)
136135
endif()
137136

138-
target_link_libraries(${PROJECT_NAME} PUBLIC
139-
Qt${QT_VERSION_MAJOR}::Core
140-
Qt${QT_VERSION_MAJOR}::Gui
141-
Qt${QT_VERSION_MAJOR}::Widgets
142-
QCefView
137+
target_link_libraries(${PROJECT_NAME}
138+
PRIVATE
139+
Qt${QT_VERSION_MAJOR}::Core
140+
Qt${QT_VERSION_MAJOR}::Gui
141+
Qt${QT_VERSION_MAJOR}::Widgets
142+
QCefView
143143
)

0 commit comments

Comments
 (0)