Skip to content

Commit 287a6b7

Browse files
eteraneteran
committed
more cmake modernization where it's obvious
1 parent d9334a8 commit 287a6b7

File tree

26 files changed

+321
-255
lines changed

26 files changed

+321
-255
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required (VERSION 3.1)
1+
cmake_minimum_required (VERSION 3.15)
22
project (edb LANGUAGES CXX VERSION 1.5.0)
33

44
enable_testing()

‎plugins/Analyzer/CMakeLists.txt‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
cmake_minimum_required (VERSION 3.1)
1+
cmake_minimum_required (VERSION 3.15)
22
include("GNUInstallDirs")
33

44
set(CMAKE_INCLUDE_CURRENT_DIR ON)
55
set(CMAKE_AUTOMOC ON)
66
set(CMAKE_AUTOUIC ON)
77

8-
set(PluginName "Analyzer")
8+
set(PLUGIN_NAME "Analyzer")
99

1010
find_package(Qt5 5.0.0 REQUIRED Widgets)
1111

12-
add_library(${PluginName} SHARED
12+
add_library(${PLUGIN_NAME} SHARED
1313
Analyzer.cpp
1414
Analyzer.h
1515
AnalyzerWidget.cpp
@@ -25,14 +25,17 @@ add_library(${PluginName} SHARED
2525
SpecifiedFunctions.ui
2626
)
2727

28-
target_link_libraries(${PluginName} Qt5::Widgets edb)
28+
target_link_libraries(${PLUGIN_NAME} Qt5::Widgets edb)
2929

30-
install (TARGETS ${PluginName} DESTINATION ${CMAKE_INSTALL_LIBDIR}/edb)
30+
install (TARGETS ${PLUGIN_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/edb)
3131

32-
target_add_warnings(${PluginName})
32+
target_add_warnings(${PLUGIN_NAME})
3333

34-
set_property(TARGET ${PluginName} PROPERTY CXX_EXTENSIONS OFF)
35-
set_property(TARGET ${PluginName} PROPERTY CXX_STANDARD 17)
36-
set_property(TARGET ${PluginName} PROPERTY CXX_STANDARD_REQUIRED ON)
37-
set_property(TARGET ${PluginName} PROPERTY LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
38-
set_property(TARGET ${PluginName} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
34+
set_target_properties(${PLUGIN_NAME}
35+
PROPERTIES
36+
CXX_EXTENSIONS OFF
37+
CXX_STANDARD 17
38+
CXX_STANDARD_REQUIRED ON
39+
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
40+
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
41+
)

‎plugins/Assembler/CMakeLists.txt‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
cmake_minimum_required (VERSION 3.1)
1+
cmake_minimum_required (VERSION 3.15)
22
include("GNUInstallDirs")
33

44
set(CMAKE_INCLUDE_CURRENT_DIR ON)
55
set(CMAKE_AUTOMOC ON)
66
set(CMAKE_AUTOUIC ON)
77

8-
set(PluginName "Assembler")
8+
set(PLUGIN_NAME "Assembler")
99

1010
find_package(Qt5 5.0.0 REQUIRED Widgets Xml XmlPatterns)
1111

12-
qt5_add_resources(QRC_SOURCES
12+
qt5_add_resources(QRC_SOURCES
1313
Assembler.qrc
1414
)
1515

1616
foreach(FILE IN LISTS QRC_SOURCES)
1717
set_property(SOURCE ${FILE} PROPERTY SKIP_UNITY_BUILD_INCLUSION ON)
1818
endforeach()
1919

20-
add_library(${PluginName} SHARED
20+
add_library(${PLUGIN_NAME} SHARED
2121
${QRC_SOURCES}
2222
Assembler.cpp
2323
Assembler.h
@@ -29,14 +29,17 @@ add_library(${PluginName} SHARED
2929
OptionsPage.ui
3030
)
3131

32-
target_link_libraries(${PluginName} Qt5::Widgets Qt5::Xml Qt5::XmlPatterns edb)
32+
target_link_libraries(${PLUGIN_NAME} Qt5::Widgets Qt5::Xml Qt5::XmlPatterns edb)
3333

34-
install (TARGETS ${PluginName} DESTINATION ${CMAKE_INSTALL_LIBDIR}/edb)
34+
install (TARGETS ${PLUGIN_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/edb)
3535

36-
target_add_warnings(${PluginName})
36+
target_add_warnings(${PLUGIN_NAME})
3737

38-
set_property(TARGET ${PluginName} PROPERTY CXX_EXTENSIONS OFF)
39-
set_property(TARGET ${PluginName} PROPERTY CXX_STANDARD 17)
40-
set_property(TARGET ${PluginName} PROPERTY CXX_STANDARD_REQUIRED ON)
41-
set_property(TARGET ${PluginName} PROPERTY LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
42-
set_property(TARGET ${PluginName} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
38+
set_target_properties(${PLUGIN_NAME}
39+
PROPERTIES
40+
CXX_EXTENSIONS OFF
41+
CXX_STANDARD 17
42+
CXX_STANDARD_REQUIRED ON
43+
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
44+
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
45+
)

‎plugins/Backtrace/CMakeLists.txt‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
cmake_minimum_required (VERSION 3.1)
1+
cmake_minimum_required (VERSION 3.15)
22
include("GNUInstallDirs")
33

44
set(CMAKE_INCLUDE_CURRENT_DIR ON)
55
set(CMAKE_AUTOMOC ON)
66
set(CMAKE_AUTOUIC ON)
77

8-
set(PluginName "Backtrace")
8+
set(PLUGIN_NAME "Backtrace")
99

1010
find_package(Qt5 5.0.0 REQUIRED Widgets)
1111

12-
add_library(${PluginName} SHARED
12+
add_library(${PLUGIN_NAME} SHARED
1313
Backtrace.cpp
1414
Backtrace.h
1515
CallStack.cpp
@@ -19,14 +19,17 @@ add_library(${PluginName} SHARED
1919
DialogBacktrace.ui
2020
)
2121

22-
target_link_libraries(${PluginName} Qt5::Widgets edb)
22+
target_link_libraries(${PLUGIN_NAME} Qt5::Widgets edb)
2323

24-
install (TARGETS ${PluginName} DESTINATION ${CMAKE_INSTALL_LIBDIR}/edb)
24+
install (TARGETS ${PLUGIN_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/edb)
2525

26-
target_add_warnings(${PluginName})
26+
target_add_warnings(${PLUGIN_NAME})
2727

28-
set_property(TARGET ${PluginName} PROPERTY CXX_EXTENSIONS OFF)
29-
set_property(TARGET ${PluginName} PROPERTY CXX_STANDARD 17)
30-
set_property(TARGET ${PluginName} PROPERTY CXX_STANDARD_REQUIRED ON)
31-
set_property(TARGET ${PluginName} PROPERTY LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
32-
set_property(TARGET ${PluginName} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
28+
set_target_properties(${PLUGIN_NAME}
29+
PROPERTIES
30+
CXX_EXTENSIONS OFF
31+
CXX_STANDARD 17
32+
CXX_STANDARD_REQUIRED ON
33+
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
34+
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
35+
)

‎plugins/BinaryInfo/CMakeLists.txt‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
cmake_minimum_required (VERSION 3.1)
1+
cmake_minimum_required (VERSION 3.15)
22
include("GNUInstallDirs")
33

44
set(CMAKE_INCLUDE_CURRENT_DIR ON)
55
set(CMAKE_AUTOMOC ON)
66
set(CMAKE_AUTOUIC ON)
77

8-
set(PluginName "BinaryInfo")
8+
set(PLUGIN_NAME "BinaryInfo")
99

1010
find_package(Qt5 5.0.0 REQUIRED Widgets)
1111

12-
add_library(${PluginName} SHARED
12+
add_library(${PLUGIN_NAME} SHARED
1313
BinaryInfo.cpp
1414
BinaryInfo.h
1515
demangle.h
@@ -32,15 +32,18 @@ add_library(${PluginName} SHARED
3232
symbols.h
3333
)
3434

35-
target_link_libraries(${PluginName} Qt5::Widgets PE ELF edb)
35+
target_link_libraries(${PLUGIN_NAME} Qt5::Widgets PE ELF edb)
3636

37-
install (TARGETS ${PluginName} DESTINATION ${CMAKE_INSTALL_LIBDIR}/edb)
37+
install (TARGETS ${PLUGIN_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/edb)
3838

39-
target_add_warnings(${PluginName})
39+
target_add_warnings(${PLUGIN_NAME})
4040

41-
set_property(TARGET ${PluginName} PROPERTY CXX_EXTENSIONS OFF)
42-
set_property(TARGET ${PluginName} PROPERTY CXX_STANDARD 17)
43-
set_property(TARGET ${PluginName} PROPERTY CXX_STANDARD_REQUIRED ON)
44-
set_property(TARGET ${PluginName} PROPERTY LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
45-
set_property(TARGET ${PluginName} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
41+
set_target_properties(${PLUGIN_NAME}
42+
PROPERTIES
43+
CXX_EXTENSIONS OFF
44+
CXX_STANDARD 17
45+
CXX_STANDARD_REQUIRED ON
46+
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
47+
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
48+
)
4649

‎plugins/BinarySearcher/CMakeLists.txt‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
cmake_minimum_required (VERSION 3.1)
1+
cmake_minimum_required (VERSION 3.15)
22
include("GNUInstallDirs")
33

44
set(CMAKE_INCLUDE_CURRENT_DIR ON)
55
set(CMAKE_AUTOMOC ON)
66
set(CMAKE_AUTOUIC ON)
77

8-
set(PluginName "BinarySearcher")
8+
set(PLUGIN_NAME "BinarySearcher")
99

1010
find_package(Qt5 5.0.0 REQUIRED Widgets)
1111

12-
add_library(${PluginName} SHARED
12+
add_library(${PLUGIN_NAME} SHARED
1313
BinarySearcher.cpp
1414
BinarySearcher.h
1515
DialogAsciiString.cpp
@@ -23,15 +23,18 @@ add_library(${PluginName} SHARED
2323
DialogResults.ui
2424
)
2525

26-
target_link_libraries(${PluginName} Qt5::Widgets edb)
26+
target_link_libraries(${PLUGIN_NAME} Qt5::Widgets edb)
2727

28-
install (TARGETS ${PluginName} DESTINATION ${CMAKE_INSTALL_LIBDIR}/edb)
28+
install (TARGETS ${PLUGIN_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/edb)
2929

30-
target_add_warnings(${PluginName})
30+
target_add_warnings(${PLUGIN_NAME})
3131

32-
set_property(TARGET ${PluginName} PROPERTY CXX_EXTENSIONS OFF)
33-
set_property(TARGET ${PluginName} PROPERTY CXX_STANDARD 17)
34-
set_property(TARGET ${PluginName} PROPERTY CXX_STANDARD_REQUIRED ON)
35-
set_property(TARGET ${PluginName} PROPERTY LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
36-
set_property(TARGET ${PluginName} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
32+
set_target_properties(${PLUGIN_NAME}
33+
PROPERTIES
34+
CXX_EXTENSIONS OFF
35+
CXX_STANDARD 17
36+
CXX_STANDARD_REQUIRED ON
37+
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
38+
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
39+
)
3740

‎plugins/Bookmarks/CMakeLists.txt‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
cmake_minimum_required (VERSION 3.1)
1+
cmake_minimum_required (VERSION 3.15)
22
include("GNUInstallDirs")
33

44
set(CMAKE_INCLUDE_CURRENT_DIR ON)
55
set(CMAKE_AUTOMOC ON)
66
set(CMAKE_AUTOUIC ON)
77

8-
set(PluginName "Bookmarks")
8+
set(PLUGIN_NAME "Bookmarks")
99

1010
find_package(Qt5 5.0.0 REQUIRED Widgets)
1111

12-
add_library(${PluginName} SHARED
12+
add_library(${PLUGIN_NAME} SHARED
1313
Bookmarks.cpp
1414
Bookmarks.h
1515
BookmarkWidget.cpp
@@ -19,14 +19,17 @@ add_library(${PluginName} SHARED
1919
BookmarkWidget.ui
2020
)
2121

22-
target_link_libraries(${PluginName} Qt5::Widgets edb)
22+
target_link_libraries(${PLUGIN_NAME} Qt5::Widgets edb)
2323

24-
install (TARGETS ${PluginName} DESTINATION ${CMAKE_INSTALL_LIBDIR}/edb)
24+
install (TARGETS ${PLUGIN_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/edb)
2525

26-
target_add_warnings(${PluginName})
26+
target_add_warnings(${PLUGIN_NAME})
2727

28-
set_property(TARGET ${PluginName} PROPERTY CXX_EXTENSIONS OFF)
29-
set_property(TARGET ${PluginName} PROPERTY CXX_STANDARD 17)
30-
set_property(TARGET ${PluginName} PROPERTY CXX_STANDARD_REQUIRED ON)
31-
set_property(TARGET ${PluginName} PROPERTY LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
32-
set_property(TARGET ${PluginName} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
28+
set_target_properties(${PLUGIN_NAME}
29+
PROPERTIES
30+
CXX_EXTENSIONS OFF
31+
CXX_STANDARD 17
32+
CXX_STANDARD_REQUIRED ON
33+
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
34+
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
35+
)

‎plugins/BreakpointManager/CMakeLists.txt‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
1-
cmake_minimum_required (VERSION 3.1)
1+
cmake_minimum_required (VERSION 3.15)
22
include("GNUInstallDirs")
33

44
set(CMAKE_INCLUDE_CURRENT_DIR ON)
55
set(CMAKE_AUTOMOC ON)
66
set(CMAKE_AUTOUIC ON)
77

8-
set(PluginName "BreakpointManager")
8+
set(PLUGIN_NAME "BreakpointManager")
99

1010
find_package(Qt5 5.0.0 REQUIRED Widgets)
1111

12-
add_library(${PluginName} SHARED
12+
add_library(${PLUGIN_NAME} SHARED
1313
BreakpointManager.cpp
1414
BreakpointManager.h
1515
)
1616

17-
target_link_libraries(${PluginName} Qt5::Widgets edb)
17+
target_link_libraries(${PLUGIN_NAME} Qt5::Widgets edb)
1818

19-
install (TARGETS ${PluginName} DESTINATION ${CMAKE_INSTALL_LIBDIR}/edb)
19+
install (TARGETS ${PLUGIN_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/edb)
2020

21-
target_add_warnings(${PluginName})
21+
target_add_warnings(${PLUGIN_NAME})
2222

23-
set_property(TARGET ${PluginName} PROPERTY CXX_EXTENSIONS OFF)
24-
set_property(TARGET ${PluginName} PROPERTY CXX_STANDARD 17)
25-
set_property(TARGET ${PluginName} PROPERTY CXX_STANDARD_REQUIRED ON)
26-
set_property(TARGET ${PluginName} PROPERTY LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
27-
set_property(TARGET ${PluginName} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
23+
set_target_properties(${PLUGIN_NAME}
24+
PROPERTIES
25+
CXX_EXTENSIONS OFF
26+
CXX_STANDARD 17
27+
CXX_STANDARD_REQUIRED ON
28+
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
29+
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
30+
)

‎plugins/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required (VERSION 3.1)
1+
cmake_minimum_required (VERSION 3.15)
22

33
add_definitions(-DQT_PLUGIN)
44

‎plugins/CheckVersion/CMakeLists.txt‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,33 @@
1-
cmake_minimum_required (VERSION 3.1)
1+
cmake_minimum_required (VERSION 3.15)
22
include("GNUInstallDirs")
33

44
set(CMAKE_INCLUDE_CURRENT_DIR ON)
55
set(CMAKE_AUTOMOC ON)
66
set(CMAKE_AUTOUIC ON)
77

8-
set(PluginName "CheckVersion")
8+
set(PLUGIN_NAME "CheckVersion")
99

1010
find_package(Qt5 5.0.0 REQUIRED Widgets Network)
1111

12-
add_library(${PluginName} SHARED
12+
add_library(${PLUGIN_NAME} SHARED
1313
CheckVersion.cpp
1414
CheckVersion.h
1515
OptionsPage.cpp
1616
OptionsPage.h
1717
OptionsPage.ui
1818
)
1919

20-
target_link_libraries(${PluginName} Qt5::Widgets Qt5::Network edb)
20+
target_link_libraries(${PLUGIN_NAME} Qt5::Widgets Qt5::Network edb)
2121

22-
install (TARGETS ${PluginName} DESTINATION ${CMAKE_INSTALL_LIBDIR}/edb)
22+
install (TARGETS ${PLUGIN_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/edb)
2323

24-
target_add_warnings(${PluginName})
24+
target_add_warnings(${PLUGIN_NAME})
2525

26-
set_property(TARGET ${PluginName} PROPERTY CXX_EXTENSIONS OFF)
27-
set_property(TARGET ${PluginName} PROPERTY CXX_STANDARD 17)
28-
set_property(TARGET ${PluginName} PROPERTY CXX_STANDARD_REQUIRED ON)
29-
set_property(TARGET ${PluginName} PROPERTY LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
30-
set_property(TARGET ${PluginName} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
26+
set_target_properties(${PLUGIN_NAME}
27+
PROPERTIES
28+
CXX_EXTENSIONS OFF
29+
CXX_STANDARD 17
30+
CXX_STANDARD_REQUIRED ON
31+
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
32+
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
33+
)

0 commit comments

Comments
 (0)