Skip to content

Commit b8458ec

Browse files
coder4869coder4869
committed
fix qt debug issue
1 parent 2320889 commit b8458ec

File tree

12 files changed

+40
-46
lines changed

12 files changed

+40
-46
lines changed

‎app/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ message("include(${CMAKE_TOOLCHAIN_ROOT}/cmake-core/global.cmake) ")
1818

1919

2020
project(${PROJECT_NAME} VERSION 1.0.0.0)
21-
set(LIB_BUILD_TYPE_EXT )
2221
# set(CMAKE_DEBUG_POSTFIX d)
2322
set(LIB_TYPE SHARED) # SHARED STATIC
2423
# set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)

‎app/run_win.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ SET BUILD_DIR=%ROOT_DIR%\build_win
1010
@REM REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\devenv.exe"
1111
SET VS_EXE="C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\devenv.exe"
1212
SET QT_INSTALL_DIR=%QT_HOME%
13-
SET PY_INSTALL_DIR=%LOCALAPPDATA%/"Programs/Python/Python311-32"
13+
SET PY_INSTALL_DIR="%LOCALAPPDATA%/Programs/Python/Python311-32"
1414
SET VS_PROJ="%BUILD_DIR%\%PROJ_NAME%.sln"
1515

1616
::echo var

‎app/scripts/cmake/cmake-core/build_clang.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ endif()
2525

2626
if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
2727
set(CMAKE_BUILD_TYPE Debug)
28-
set(LIB_BUILD_TYPE_EXT d)
2928
elseif(CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
3029
set(CMAKE_BUILD_TYPE Release)
3130
endif()
@@ -35,7 +34,6 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
3534
# For Debug and RelWithDebInfo
3635
add_definitions(-D DEBUG)
3736
set(CMAKE_CONFIGURATION_TYPES "Debug" CACHE STRING "" FORCE)
38-
set(LIB_BUILD_TYPE_EXT d)
3937

4038
if(NOT WIN)
4139
add_compile_options(

‎app/scripts/cmake/cmake-core/build_gcc.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ endif()
2525

2626
if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
2727
set(CMAKE_BUILD_TYPE Debug)
28-
set(LIB_BUILD_TYPE_EXT d)
2928
elseif(CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
3029
set(CMAKE_BUILD_TYPE Release)
3130
endif()
@@ -35,7 +34,6 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
3534
# For Debug and RelWithDebInfo
3635
add_definitions(-D DEBUG)
3736
set(CMAKE_CONFIGURATION_TYPES "Debug" CACHE STRING "" FORCE)
38-
set(LIB_BUILD_TYPE_EXT d)
3937

4038
if(NOT WIN)
4139
add_compile_options(

‎app/scripts/cmake/cmake-core/build_nmake.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ endif()
2525

2626
if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
2727
set(CMAKE_BUILD_TYPE Debug)
28-
set(LIB_BUILD_TYPE_EXT d)
2928
elseif(CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
3029
set(CMAKE_BUILD_TYPE Release)
3130
endif()
@@ -35,7 +34,6 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
3534
# For Debug and RelWithDebInfo
3635
add_definitions(-D DEBUG)
3736
set(CMAKE_CONFIGURATION_TYPES "Debug" CACHE STRING "" FORCE)
38-
set(LIB_BUILD_TYPE_EXT d)
3937

4038
if(NOT WIN)
4139
add_compile_options(

‎app/scripts/cmake/cmake-qt/qt_libs.cmake

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,28 @@ if(WITH_QT)
2424
# ${QT_INSTALL_DIR}/include/QtQuick2Plugin
2525
)
2626

27-
# LIB_BUILD_TYPE_EXT = d for debug, empty for release
27+
# LIB_EXT = d for debug, empty for release
28+
SET(LIB_EXT "")
29+
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
30+
SET(LIB_EXT "d")
31+
endif()
2832
SET(LIB_QT
29-
${QT_INSTALL_DIR}/lib/Qt5Core${LIB_BUILD_TYPE_EXT}.lib
30-
${QT_INSTALL_DIR}/lib/Qt5Gui${LIB_BUILD_TYPE_EXT}.lib
31-
${QT_INSTALL_DIR}/lib/Qt5Sql${LIB_BUILD_TYPE_EXT}.lib
32-
${QT_INSTALL_DIR}/lib/Qt5OpenGL${LIB_BUILD_TYPE_EXT}.lib
33-
${QT_INSTALL_DIR}/lib/Qt5Widgets${LIB_BUILD_TYPE_EXT}.lib
34-
${QT_INSTALL_DIR}/lib/Qt5Charts${LIB_BUILD_TYPE_EXT}.lib
35-
${QT_INSTALL_DIR}/lib/Qt5Network${LIB_BUILD_TYPE_EXT}.lib
33+
${QT_INSTALL_DIR}/lib/Qt5Core${LIB_EXT}.lib
34+
${QT_INSTALL_DIR}/lib/Qt5Gui${LIB_EXT}.lib
35+
${QT_INSTALL_DIR}/lib/Qt5Sql${LIB_EXT}.lib
36+
${QT_INSTALL_DIR}/lib/Qt5OpenGL${LIB_EXT}.lib
37+
${QT_INSTALL_DIR}/lib/Qt5Widgets${LIB_EXT}.lib
38+
${QT_INSTALL_DIR}/lib/Qt5Charts${LIB_EXT}.lib
39+
${QT_INSTALL_DIR}/lib/Qt5Network${LIB_EXT}.lib
3640
# Camera
37-
${QT_INSTALL_DIR}/lib/Qt5Multimedia${LIB_BUILD_TYPE_EXT}.lib
38-
${QT_INSTALL_DIR}/lib/Qt5MultimediaWidgets${LIB_BUILD_TYPE_EXT}.lib
41+
${QT_INSTALL_DIR}/lib/Qt5Multimedia${LIB_EXT}.lib
42+
${QT_INSTALL_DIR}/lib/Qt5MultimediaWidgets${LIB_EXT}.lib
3943
# qml - Quick
40-
${QT_INSTALL_DIR}/lib/Qt5Qml${LIB_BUILD_TYPE_EXT}.lib
41-
${QT_INSTALL_DIR}/lib/Qt5Quick${LIB_BUILD_TYPE_EXT}.lib
42-
${QT_INSTALL_DIR}/lib/Qt5QuickWidgets${LIB_BUILD_TYPE_EXT}.lib
43-
${QT_INSTALL_DIR}/lib/Qt5QuickControls2${LIB_BUILD_TYPE_EXT}.lib
44-
# ${QT_INSTALL_DIR}/lib/QtQuick2Plugin${LIB_BUILD_TYPE_EXT}.lib
44+
${QT_INSTALL_DIR}/lib/Qt5Qml${LIB_EXT}.lib
45+
${QT_INSTALL_DIR}/lib/Qt5Quick${LIB_EXT}.lib
46+
${QT_INSTALL_DIR}/lib/Qt5QuickWidgets${LIB_EXT}.lib
47+
${QT_INSTALL_DIR}/lib/Qt5QuickControls2${LIB_EXT}.lib
48+
# ${QT_INSTALL_DIR}/lib/QtQuick2Plugin${LIB_EXT}.lib
4549
)
4650

4751
elseif(OSX) # for MacOSX

‎plugins/project/project/build/run_win.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ SET BUILD_DIR=%ROOT_DIR%\build_win
1010
@REM REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\devenv.exe"
1111
SET VS_EXE="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Common7\IDE\devenv.exe"
1212
SET QT_INSTALL_DIR=%QT_HOME%
13-
SET PY_INSTALL_DIR=%LOCALAPPDATA%/"Programs/Python/Python311-32"
13+
SET PY_INSTALL_DIR="%LOCALAPPDATA%/Programs/Python/Python311-32"
1414
SET VS_PROJ="%BUILD_DIR%\%PROJ_NAME%.sln"
1515

1616
::echo var

‎plugins/project/project/cmake/cmake-core/build_clang.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ endif()
2525

2626
if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
2727
set(CMAKE_BUILD_TYPE Debug)
28-
set(LIB_BUILD_TYPE_EXT d)
2928
elseif(CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
3029
set(CMAKE_BUILD_TYPE Release)
3130
endif()
@@ -35,7 +34,6 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
3534
# For Debug and RelWithDebInfo
3635
add_definitions(-D DEBUG)
3736
set(CMAKE_CONFIGURATION_TYPES "Debug" CACHE STRING "" FORCE)
38-
set(LIB_BUILD_TYPE_EXT d)
3937

4038
if(NOT WIN)
4139
add_compile_options(

‎plugins/project/project/cmake/cmake-core/build_gcc.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ endif()
2525

2626
if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
2727
set(CMAKE_BUILD_TYPE Debug)
28-
set(LIB_BUILD_TYPE_EXT d)
2928
elseif(CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
3029
set(CMAKE_BUILD_TYPE Release)
3130
endif()
@@ -35,7 +34,6 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
3534
# For Debug and RelWithDebInfo
3635
add_definitions(-D DEBUG)
3736
set(CMAKE_CONFIGURATION_TYPES "Debug" CACHE STRING "" FORCE)
38-
set(LIB_BUILD_TYPE_EXT d)
3937

4038
if(NOT WIN)
4139
add_compile_options(

‎plugins/project/project/cmake/cmake-core/build_nmake.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ endif()
2525

2626
if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
2727
set(CMAKE_BUILD_TYPE Debug)
28-
set(LIB_BUILD_TYPE_EXT d)
2928
elseif(CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
3029
set(CMAKE_BUILD_TYPE Release)
3130
endif()
@@ -35,7 +34,6 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
3534
# For Debug and RelWithDebInfo
3635
add_definitions(-D DEBUG)
3736
set(CMAKE_CONFIGURATION_TYPES "Debug" CACHE STRING "" FORCE)
38-
set(LIB_BUILD_TYPE_EXT d)
3937

4038
if(NOT WIN)
4139
add_compile_options(

‎plugins/project/project/cmake/cmake-qt/qt_libs.cmake

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,28 @@ if(WITH_QT)
2424
# ${QT_INSTALL_DIR}/include/QtQuick2Plugin
2525
)
2626

27-
# LIB_BUILD_TYPE_EXT = d for debug, empty for release
27+
# LIB_EXT = d for debug, empty for release
28+
SET(LIB_EXT "")
29+
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
30+
SET(LIB_EXT "d")
31+
endif()
2832
SET(LIB_QT
29-
${QT_INSTALL_DIR}/lib/Qt5Core${LIB_BUILD_TYPE_EXT}.lib
30-
${QT_INSTALL_DIR}/lib/Qt5Gui${LIB_BUILD_TYPE_EXT}.lib
31-
${QT_INSTALL_DIR}/lib/Qt5Sql${LIB_BUILD_TYPE_EXT}.lib
32-
${QT_INSTALL_DIR}/lib/Qt5OpenGL${LIB_BUILD_TYPE_EXT}.lib
33-
${QT_INSTALL_DIR}/lib/Qt5Widgets${LIB_BUILD_TYPE_EXT}.lib
34-
${QT_INSTALL_DIR}/lib/Qt5Charts${LIB_BUILD_TYPE_EXT}.lib
35-
${QT_INSTALL_DIR}/lib/Qt5Network${LIB_BUILD_TYPE_EXT}.lib
33+
${QT_INSTALL_DIR}/lib/Qt5Core${LIB_EXT}.lib
34+
${QT_INSTALL_DIR}/lib/Qt5Gui${LIB_EXT}.lib
35+
${QT_INSTALL_DIR}/lib/Qt5Sql${LIB_EXT}.lib
36+
${QT_INSTALL_DIR}/lib/Qt5OpenGL${LIB_EXT}.lib
37+
${QT_INSTALL_DIR}/lib/Qt5Widgets${LIB_EXT}.lib
38+
${QT_INSTALL_DIR}/lib/Qt5Charts${LIB_EXT}.lib
39+
${QT_INSTALL_DIR}/lib/Qt5Network${LIB_EXT}.lib
3640
# Camera
37-
${QT_INSTALL_DIR}/lib/Qt5Multimedia${LIB_BUILD_TYPE_EXT}.lib
38-
${QT_INSTALL_DIR}/lib/Qt5MultimediaWidgets${LIB_BUILD_TYPE_EXT}.lib
41+
${QT_INSTALL_DIR}/lib/Qt5Multimedia${LIB_EXT}.lib
42+
${QT_INSTALL_DIR}/lib/Qt5MultimediaWidgets${LIB_EXT}.lib
3943
# qml - Quick
40-
${QT_INSTALL_DIR}/lib/Qt5Qml${LIB_BUILD_TYPE_EXT}.lib
41-
${QT_INSTALL_DIR}/lib/Qt5Quick${LIB_BUILD_TYPE_EXT}.lib
42-
${QT_INSTALL_DIR}/lib/Qt5QuickWidgets${LIB_BUILD_TYPE_EXT}.lib
43-
${QT_INSTALL_DIR}/lib/Qt5QuickControls2${LIB_BUILD_TYPE_EXT}.lib
44-
# ${QT_INSTALL_DIR}/lib/QtQuick2Plugin${LIB_BUILD_TYPE_EXT}.lib
44+
${QT_INSTALL_DIR}/lib/Qt5Qml${LIB_EXT}.lib
45+
${QT_INSTALL_DIR}/lib/Qt5Quick${LIB_EXT}.lib
46+
${QT_INSTALL_DIR}/lib/Qt5QuickWidgets${LIB_EXT}.lib
47+
${QT_INSTALL_DIR}/lib/Qt5QuickControls2${LIB_EXT}.lib
48+
# ${QT_INSTALL_DIR}/lib/QtQuick2Plugin${LIB_EXT}.lib
4549
)
4650

4751
elseif(OSX) # for MacOSX

‎plugins/project/project/template/CMakeLists.txt.PROJ

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ message("include(${CMAKE_TOOLCHAIN_ROOT}/cmake-core/global.cmake) ")
1818

1919

2020
project(${PROJECT_NAME} VERSION 1.0.0.0)
21-
set(LIB_BUILD_TYPE_EXT )
2221
# set(CMAKE_DEBUG_POSTFIX d)
2322
set(LIB_TYPE SHARED) # SHARED STATIC
2423
# set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)

0 commit comments

Comments
 (0)