Skip to content

Commit f055768

Browse files
XECDesignpelwell
authored andcommitted
CMake: Use GNUInstallDirs
Signed-off-by: Serge Schneider <[email protected]>
1 parent 67b66ff commit f055768

File tree

6 files changed

+18
-8
lines changed

6 files changed

+18
-8
lines changed

dtmerge/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
cmake_minimum_required(VERSION 3.10)
22

3+
include(GNUInstallDirs)
4+
35
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -pedantic")
46

57
#set project name
@@ -8,5 +10,5 @@ project(dtmerge)
810
#add executables
911
add_executable(dtmerge dtmerge.c dtoverlay.c)
1012
target_link_libraries(dtmerge fdt)
11-
install(TARGETS dtmerge RUNTIME DESTINATION bin)
12-
install(FILES dtmerge.1 DESTINATION man/man1)
13+
install(TARGETS dtmerge RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
14+
install(FILES dtmerge.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)

otpset/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
cmake_minimum_required(VERSION 3.10)
22

3+
include(GNUInstallDirs)
4+
35
#set project name
46
project(otpset)
57

68
#add executables
7-
install(PROGRAMS otpset DESTINATION bin)
9+
install(PROGRAMS otpset DESTINATION ${CMAKE_INSTALL_BINDIR})

overlaycheck/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
cmake_minimum_required(VERSION 3.10)
22

3+
include(GNUInstallDirs)
4+
35
#set project name
46
project(overlaycheck)
57

68
#add executables
7-
install(PROGRAMS overlaycheck DESTINATION bin)
8-
install(FILES overlaycheck_exclusions.txt DESTINATION bin)
9+
install(PROGRAMS overlaycheck DESTINATION ${CMAKE_INSTALL_BINDIR})
10+
install(FILES overlaycheck_exclusions.txt DESTINATION ${CMAKE_INSTALL_BINDIR})

ovmerge/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
cmake_minimum_required(VERSION 3.10)
22

3+
include(GNUInstallDirs)
4+
35
#set project name
46
project(ovmerge)
57

68
#add executables
7-
install(PROGRAMS ovmerge DESTINATION bin)
9+
install(PROGRAMS ovmerge DESTINATION ${CMAKE_INSTALL_BINDIR})

raspinfo/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
cmake_minimum_required(VERSION 3.10)
22

3+
include(GNUInstallDirs)
4+
35
#set project name
46
project(raspinfo)
57

68
#add executables
7-
install(PROGRAMS raspinfo DESTINATION bin)
9+
install(PROGRAMS raspinfo DESTINATION ${CMAKE_INSTALL_BINDIR})

vclog/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ project(vclog)
77

88
#add executables
99
add_executable(vclog vcdbg.c)
10-
install(TARGETS vclog RUNTIME DESTINATION bin)
10+
install(TARGETS vclog RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

0 commit comments

Comments
 (0)