Skip to content

Commit 3f53e65

Browse files
committed
use GNUInstallDirs for install paths
1 parent c04a996 commit 3f53e65

File tree

3 files changed

+26
-24
lines changed

3 files changed

+26
-24
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ project(PCM)
88
set(CMAKE_CXX_STANDARD 11)
99
set(CMAKE_CXX_STANDARD_REQUIRED True)
1010

11+
include(GNUInstallDirs)
12+
1113
set(THREADS_PREFER_PTHREAD_FLAG ON)
1214
find_package(Threads REQUIRED)
1315

pcm.spec

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,21 @@ rm -rf $RPM_BUILD_ROOT
4242
%files
4343
%defattr(-,root,root,0755)
4444
%doc LICENSE doc/LINUX_HOWTO.txt
45-
/usr/share/doc/pcm
45+
/usr/share/doc/PCM
4646
/usr/share/licenses/pcm
47-
/usr/share/doc/pcm/CUSTOM-COMPILE-OPTIONS.md
48-
/usr/share/doc/pcm/DOCKER_README.md
49-
/usr/share/doc/pcm/ENVVAR_README.md
50-
/usr/share/doc/pcm/FAQ.md
51-
/usr/share/doc/pcm/FREEBSD_HOWTO.txt
52-
/usr/share/doc/pcm/LINUX_HOWTO.txt
53-
/usr/share/doc/pcm/MAC_HOWTO.txt
54-
/usr/share/doc/pcm/PCM-EXPORTER.md
55-
/usr/share/doc/pcm/PCM-SENSOR-SERVER-README.md
56-
/usr/share/doc/pcm/PCM_RAW_README.md
57-
/usr/share/doc/pcm/README.md
58-
/usr/share/doc/pcm/WINDOWS_HOWTO.md
59-
/usr/share/doc/pcm/license.txt
47+
/usr/share/doc/PCM/CUSTOM-COMPILE-OPTIONS.md
48+
/usr/share/doc/PCM/DOCKER_README.md
49+
/usr/share/doc/PCM/ENVVAR_README.md
50+
/usr/share/doc/PCM/FAQ.md
51+
/usr/share/doc/PCM/FREEBSD_HOWTO.txt
52+
/usr/share/doc/PCM/LINUX_HOWTO.txt
53+
/usr/share/doc/PCM/MAC_HOWTO.txt
54+
/usr/share/doc/PCM/PCM-EXPORTER.md
55+
/usr/share/doc/PCM/PCM-SENSOR-SERVER-README.md
56+
/usr/share/doc/PCM/PCM_RAW_README.md
57+
/usr/share/doc/PCM/README.md
58+
/usr/share/doc/PCM/WINDOWS_HOWTO.md
59+
/usr/share/doc/PCM/license.txt
6060
/usr/share/licenses/pcm/LICENSE
6161
%{_sbindir}/pcm-core
6262
%{_sbindir}/pcm-iio

src/CMakeLists.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ foreach(PROJECT_NAME ${PROJECT_NAMES})
9191

9292
if(LINUX OR FREE_BSD)
9393
set(LIBS ${LIBS} Threads::Threads)
94-
install(TARGETS ${PROJECT_NAME} DESTINATION "sbin")
94+
install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_SBINDIR})
9595
endif(LINUX OR FREE_BSD)
9696

9797
if(APPLE)
9898
set(LIBS ${LIBS} Threads::Threads PcmMsr)
99-
install(TARGETS ${PROJECT_NAME} DESTINATION "sbin")
99+
install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_SBINDIR})
100100
endif(APPLE)
101101

102102
if(MSVC)
@@ -117,39 +117,39 @@ if(UNIX) # APPLE, LINUX, FREE_BSD
117117
add_executable(daemon ${DAEMON_SOURCES})
118118
target_link_libraries(daemon PRIVATE PCM_STATIC Threads::Threads)
119119
set_target_properties(daemon PROPERTIES OUTPUT_NAME "pcm-daemon")
120-
install(TARGETS daemon DESTINATION "sbin")
120+
install(TARGETS daemon DESTINATION ${CMAKE_INSTALL_SBINDIR})
121121

122122
file(GLOB CLIENT_SOURCES "client/*.cpp")
123123
add_executable(client ${CLIENT_SOURCES})
124124
target_link_libraries(client PRIVATE Threads::Threads)
125125
set_target_properties(client PROPERTIES OUTPUT_NAME "pcm-client")
126-
install(TARGETS client DESTINATION "bin")
126+
install(TARGETS client DESTINATION ${CMAKE_INSTALL_BINDIR})
127127
endif(LINUX)
128128

129129
# Install extra files
130130
install(FILES pcm-bw-histogram.sh
131-
DESTINATION "sbin"
131+
DESTINATION ${CMAKE_INSTALL_SBINDIR}
132132
RENAME pcm-bw-histogram
133133
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
134134
file(GLOB OPCODE_FILES "opCode*.txt")
135135
foreach(opcode_file ${OPCODE_FILES})
136136
get_filename_component(opcode_file_name ${opcode_file} NAME)
137137
configure_file(${opcode_file} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${opcode_file_name} COPYONLY)
138-
install(FILES ${opcode_file} DESTINATION "share/pcm")
138+
install(FILES ${opcode_file} DESTINATION ${CMAKE_INSTALL_DATADIR}/pcm)
139139
endforeach(opcode_file ${OPCODE_FILES})
140140

141141
file(COPY "PMURegisterDeclarations" DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
142-
install(DIRECTORY "PMURegisterDeclarations" DESTINATION "share/pcm")
142+
install(DIRECTORY "PMURegisterDeclarations" DESTINATION ${CMAKE_INSTALL_DATADIR}/pcm)
143143

144144
# Install docs
145-
install(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION "share/licenses/pcm/")
146-
install(FILES ${CMAKE_SOURCE_DIR}/README.md DESTINATION "share/doc/pcm/")
145+
install(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/pcm)
146+
install(FILES ${CMAKE_SOURCE_DIR}/README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
147147

148148
file(GLOB DOC_FILES ${CMAKE_SOURCE_DIR}/doc/*.txt ${CMAKE_SOURCE_DIR}/doc/*.md)
149149
foreach(doc_file ${DOC_FILES})
150150
get_filename_component(doc_file_name ${doc_file} NAME)
151151
configure_file(${doc_file} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${doc_file_name} COPYONLY)
152-
install(FILES ${doc_file} DESTINATION "share/doc/pcm/")
152+
install(FILES ${doc_file} DESTINATION ${CMAKE_INSTALL_DOCDIR})
153153
endforeach(doc_file ${DOC_FILES})
154154

155155
endif(UNIX)

0 commit comments

Comments
 (0)