Skip to content

Commit bc7407e

Browse files
committed
fixed #14922 - do not use absolute paths in CMake INSTALL / added TODOs
1 parent 8e5682d commit bc7407e

6 files changed

Lines changed: 14 additions & 4 deletions

File tree

.github/workflows/CI-unixish.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ jobs:
150150
- name: Run CMake install
151151
run: |
152152
cmake --build cmake.output --target install
153+
# TODO: validate the installed files
153154
154155
- name: Run CMake on ubuntu (no CLI)
155156
if: matrix.os == 'ubuntu-22.04'

.github/workflows/CI-windows.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ jobs:
6969
- name: Run CMake install
7070
run: |
7171
cmake --build build --target install
72+
# TODO: validate the installed files
7273
7374
build_cmake_cxxstd:
7475
strategy:

cli/CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,15 @@ if (BUILD_CLI)
4040
endif()
4141

4242
install(TARGETS cppcheck
43-
RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
43+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
4444
COMPONENT applications)
4545

4646
install(PROGRAMS ${CMAKE_SOURCE_DIR}/htmlreport/cppcheck-htmlreport
47-
DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
47+
DESTINATION ${CMAKE_INSTALL_BINDIR}
4848
COMPONENT applications)
4949

50+
# TODO: leverage CMAKE_INSTALL_DATAROOTDIR (share)?
51+
5052
install(FILES ${addons_py}
5153
DESTINATION ${FILESDIR_DEF}/addons
5254
COMPONENT headers)
@@ -63,4 +65,7 @@ if (BUILD_CLI)
6365
DESTINATION ${FILESDIR_DEF}/platforms
6466
COMPONENT headers)
6567

68+
# TODO: install manpage into CMAKE_INSTALL_MANDIR
69+
# TODO: install documentation into CMAKE_INSTALL_DOCDIR?
70+
6671
endif()

cmake/options.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,11 @@ set(CMAKE_DISABLE_PRECOMPILE_HEADERS Off CACHE BOOL "Disable precompiled headers
134134
# see https://gitlab.kitware.com/cmake/cmake/-/issues/21219
135135
set(CMAKE_PCH_PROLOGUE "")
136136

137+
# TODO: do we need to set these?
137138
set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "Output directory for headers")
138139
set(CMAKE_LIB_DIRS_CONFIGCMAKE ${CMAKE_INSTALL_PREFIX}/lib CACHE PATH "Output directory for libraries")
139140

141+
# TODO: do we need to set these?
140142
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
141143
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
142144
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)

cmake/printInfo.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ message(STATUS "Compiler Version = ${CMAKE_CXX_COMPILER_VERSION}")
88
message(STATUS "Build type = ${CMAKE_BUILD_TYPE}")
99
message(STATUS "CMake C++ Standard = ${CMAKE_CXX_STANDARD}")
1010
message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")
11+
message(STATUS "CMAKE_INSTALL_BINDIR = ${CMAKE_INSTALL_BINDIR}")
1112
message(STATUS "CMAKE_DISABLE_PRECOMPILE_HEADERS = ${CMAKE_DISABLE_PRECOMPILE_HEADERS}")
1213
message(STATUS "C++ flags (General) = ${CMAKE_CXX_FLAGS}")
1314
message(STATUS "C++ flags (Release) = ${CMAKE_CXX_FLAGS_RELEASE}")

gui/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ CheckOptions:
7171
add_dependencies(cppcheck-gui online-help.qhc)
7272
endif()
7373

74-
install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)
75-
install(FILES ${qms} DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)
74+
install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)
75+
install(FILES ${qms} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)
7676

7777
install(FILES cppcheck-gui.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
7878

0 commit comments

Comments
 (0)