Skip to content

Commit 8f40b82

Browse files
authored
removed non-working dmake project from Visual Studio solution / other dmake related cleanups (danmar#7019)
* tools/dmake/CMakeLists.txt: properly specify `utils.cpp` * iwyu.yml: added TODO about unnecessary dmake build * removed non-working `dmake` project from Visual Studio solution
1 parent bf92303 commit 8f40b82

File tree

4 files changed

+5
-123
lines changed

4 files changed

+5
-123
lines changed

.github/workflows/iwyu.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ jobs:
9898

9999
- name: Prepare CMake
100100
run: |
101+
# TODO: why does it build dmake in the next step?
101102
cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On -DUSE_LIBCXX=${{ matrix.use_libcxx }}
102103
env:
103104
CC: clang
@@ -188,6 +189,7 @@ jobs:
188189

189190
- name: Prepare CMake
190191
run: |
192+
# TODO: why does it build dmake in the next step?
191193
cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On -DUSE_LIBCXX=${{ matrix.use_libcxx }}
192194
env:
193195
CC: clang-19

cppcheck.sln

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29020.237
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.12.35506.116 d17.12
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cli", "cli\cli.vcxproj", "{35CBDF51-2456-3EC3-99ED-113C30858883}"
77
ProjectSection(ProjectDependencies) = postProject
@@ -15,8 +15,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testrunner", "test\testrunn
1515
EndProject
1616
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppcheck", "lib\cppcheck.vcxproj", "{C183DB5B-AD6C-423D-80CA-1F9549555A1A}"
1717
EndProject
18-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dmake", "tools\dmake\dmake.vcxproj", "{19EC86CD-0004-4917-B852-E6BD110B6E6F}"
19-
EndProject
2018
Global
2119
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2220
Debug|x64 = Debug|x64
@@ -49,10 +47,6 @@ Global
4947
{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release|x64.Build.0 = Release|x64
5048
{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release-PCRE|x64.ActiveCfg = Release-PCRE|x64
5149
{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release-PCRE|x64.Build.0 = Release-PCRE|x64
52-
{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug|x64.ActiveCfg = Debug|x64
53-
{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug-PCRE|x64.ActiveCfg = Debug|x64
54-
{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release|x64.ActiveCfg = Release|x64
55-
{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release-PCRE|x64.ActiveCfg = Release|x64
5650
EndGlobalSection
5751
GlobalSection(SolutionProperties) = preSolution
5852
HideSolutionNode = FALSE

tools/dmake/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# TODO: when using ccache and matchcompiler this will accessed before the file was generated and thus the build fails
2-
set(srcs_lib pathmatch.cpp path.cpp)
2+
set(srcs_lib pathmatch.cpp path.cpp utils.cpp)
33
foreach(file ${srcs_lib})
44
if (NOT USE_MATCHCOMPILER_OPT STREQUAL "Off")
55
set(src "${CMAKE_BINARY_DIR}/lib/build/mc_${file}")
@@ -14,7 +14,6 @@ add_executable(dmake EXCLUDE_FROM_ALL
1414
dmake.cpp
1515
${CMAKE_SOURCE_DIR}/cli/filelister.cpp
1616
${srcs_tools}
17-
${CMAKE_SOURCE_DIR}/lib/utils.cpp
1817
$<TARGET_OBJECTS:simplecpp_objs>
1918
)
2019
target_include_directories(dmake PRIVATE ${CMAKE_SOURCE_DIR}/cli ${CMAKE_SOURCE_DIR}/lib)

tools/dmake/dmake.vcxproj

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

0 commit comments

Comments
 (0)