Skip to content

Commit 0516f52

Browse files
committed
new CMakeLists.txt
1 parent 733c0e8 commit 0516f52

File tree

2 files changed

+19
-92
lines changed

2 files changed

+19
-92
lines changed

CMakeLists.txt

Lines changed: 0 additions & 56 deletions
This file was deleted.

src/CMakeLists.txt

Lines changed: 19 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,53 @@
1-
cmake_minimum_required(VERSION 4.3.0)
1+
cmake_minimum_required(VERSION 3.30.0)
22

33
# set the project name
44
project(GreasePad VERSION 1.2.1 LANGUAGES CXX)
55

66

77
# CONFIG specify the C++ standard
8-
set(CMAKE_CXX_STANDARD 11)
8+
set(CMAKE_CXX_STANDARD 17)
99
set(CMAKE_CXX_STANDARD_REQUIRED True)
1010

1111
# my installation directories
1212
set(Qt6_DIR "C:/Qt/6.10.0/msvc2022_64/lib/cmake/Qt6")
1313

14+
set(CMAKE_CONFIGURATION_TYPES "Debug;Release;Profile")
15+
set(CMAKE_INSTALL_PREFIX "D:/Dev")
16+
#set(CMAKE_BUILD_TYPE "Debug")
1417

1518

16-
17-
18-
19-
find_package(Qt6 REQUIRED COMPONENTS Core)
20-
21-
22-
set(CMAKE_AUTOMOC ON)
23-
set(CMAKE_AUTORCC ON)
24-
set(CMAKE_AUTOUIC ON)
25-
26-
#set(Qt6_DIR "C:/Qt/6.10.0/mscv2022_64/lib/cmake/Qt6")
27-
2819
find_package(Qt6 REQUIRED COMPONENTS Core Widgets Svg)
2920

3021
qt_standard_project_setup()
3122

3223
# add the executable
3324
qt_add_executable(GreasePad
34-
adjustment.cpp
35-
commands.cpp
25+
adjustment.cpp
26+
commands.cpp
3627
constraints.cpp
3728
main.cpp
3829
mainwindow.cpp
3930
mainscene.cpp
4031
mainview.cpp
4132
matrix.cpp
42-
qconstraints.cpp
33+
qconstraints.cpp
4334
qformattool.cpp
4435
qsegment.cpp
4536
qstroke.cpp
4637
quantiles.cpp
4738
state.cpp
48-
uncertain/quncertain.cpp
39+
uncertain/quncertain.cpp
4940
uncertain/uncertain.cpp
5041
uncertain/upoint.cpp
5142
uncertain/usegment.cpp
5243
uncertain/ustraightline.cpp
5344
)
5445

46+
qt_add_resources(GreasePad "images"
47+
PREFIX "/"
48+
FILES icons/Tango/preferences-desktop-peripherals.svg icons/Tango/Edit-clear.svg
49+
)
50+
5551

5652
# INCLUDEPATH
5753
target_include_directories(GreasePad PUBLIC "D:/Dev/clone/eigen/")
@@ -65,26 +61,13 @@ target_include_directories(GreasePad PUBLIC "C:/Qt/6.10.0/msvc2022_64/include")
6561

6662

6763

68-
#set(Eigen3_DIR "D:/Dev/clone/eigen/")
69-
#set(CMAKE_CONFIGURATION_TYPES "Debug;Release;Profile")
70-
set(CMAKE_INSTALL_PREFIX "D:/Dev")
71-
set(CMAKE_BUILD_TYPE "Debug")
72-
73-
74-
#if(CMAKE_VERSION VERSION_LESS "3.7.0")
75-
# set(CMAKE_INCLUDE_CURRENT_DIR ON)
76-
#endif()
77-
7864

79-
#find_package(Eigen3 REQUIRED NO_MODULE)
65+
target_link_libraries(GreasePad PRIVATE Qt6::Widgets Qt6::Svg)
8066

8167

82-
#target_link_libraries(GreasePad Eigen)
83-
target_link_libraries(GreasePad PRIVATE Qt6::Core Qt6::Widgets Qt6::Svg)
84-
85-
86-
install(TARGETS GreasePad DESTINATION bin CONFIGURATION Debug)
87-
68+
install(TARGETS GreasePad DESTINATION bin
69+
CONFIGURATIONS Release Debug
70+
)
8871

8972
# in Eingabeaufforderung (not PowerShell)
90-
# set PATH=C:\Qt\6.10.0\msvc2022_64\bin;%PATH%
73+
# set PATH=C:\Qt\6.10.0\msvc2022_64\bin;%PATH%

0 commit comments

Comments
 (0)