Skip to content

Commit 289f78b

Browse files
Xottab-DUTYXottab-DUTY
committed
CMake: move packaging related stuff from utils.cmake to packaging.cmake
1 parent 52c3e2e commit 289f78b

File tree

2 files changed

+48
-62
lines changed

2 files changed

+48
-62
lines changed

‎cmake/packaging.cmake

+48-36
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,60 @@
1-
if (UNIX)
2-
if (EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
3-
set(CPACK_PACKAGE_VENDOR "OpenXRay Team")
4-
set(CPACK_PACKAGE_CONTACT "OpenXRay <[email protected]>")
5-
set(CPACK_PACKAGE_DESCRIPTION ${CMAKE_PROJECT_DESCRIPTION})
1+
set(CPACK_PACKAGE_VENDOR "OpenXRay Team")
2+
set(CPACK_PACKAGE_CONTACT "OpenXRay <[email protected]>")
3+
set(CPACK_PACKAGE_DESCRIPTION ${CMAKE_PROJECT_DESCRIPTION})
64

7-
set(CPACK_PACKAGE_FILE_NAME "openxray-${CMAKE_PROJECT_VERSION}-${CMAKE_SYSTEM_PROCESSOR}")
5+
set(CPACK_PACKAGE_FILE_NAME "openxray-${CMAKE_PROJECT_VERSION}-${CMAKE_SYSTEM_PROCESSOR}")
86

9-
set(CPACK_STRIP_FILES TRUE)
10-
set(CPACK_SOURCE_IGNORE_FILES "/.gitattributes")
11-
set(CPACK_RESOURCE_FILE_README ${PROJECT_SOURCE_DIR}/README.md)
12-
set(CPACK_RESOURCE_FILE_LICENSE ${PROJECT_SOURCE_DIR}/License.txt)
7+
set(CPACK_STRIP_FILES TRUE)
8+
set(CPACK_SOURCE_IGNORE_FILES "/.gitattributes")
9+
set(CPACK_RESOURCE_FILE_README ${PROJECT_SOURCE_DIR}/README.md)
10+
set(CPACK_RESOURCE_FILE_LICENSE ${PROJECT_SOURCE_DIR}/License.txt)
1311

14-
# --- SELECT PROPER CPACK GENERATOR ---
15-
if (DEBIAN_FOUND)
16-
set(CPACK_GENERATOR DEB)
12+
if (UNIX)
13+
# Try to find specific OS files to determine type of linux distribution
14+
find_file(FEDORA_FOUND fedora-release PATHS /etc)
15+
find_file(REDHAT_FOUND redhat-release inittab.RH PATHS /etc)
16+
find_file(CENTOS_FOUND centos-release PATHS /etc)
17+
# If we found debian then we don't need to check further for ubuntu
18+
# as it uses debian core.
19+
find_file(DEBIAN_FOUND debian_version debconf.conf PATHS /etc)
20+
21+
# --------------------------------------------------
22+
# Uninstall target
23+
# --------------------------------------------------
24+
# To clean system folder from libraries and binaries
25+
# that was installed with `sudo make install`
26+
# just run `sudo make uninstall`
27+
if (NOT TARGET uninstall)
28+
configure_file(
29+
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
30+
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
31+
IMMEDIATE @ONLY)
32+
33+
add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
34+
endif()
1735

18-
set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
36+
# --- SELECT PROPER CPACK GENERATOR ---
37+
if (DEBIAN_FOUND)
38+
set(CPACK_GENERATOR DEB)
1939

20-
set(CPACK_DEBIAN_PACKAGE_SECTION "games")
21-
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
22-
set(CPACK_DEBIAN_PACKAGE_CONTROL_STRICT_PERMISSION TRUE)
23-
endif()
40+
set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
2441

25-
if (FEDORA_FOUND OR REDHAT_FOUND OR CENTOS_FOUND)
26-
set(CPACK_GENERATOR RPM)
42+
set(CPACK_DEBIAN_PACKAGE_SECTION "games")
43+
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
44+
set(CPACK_DEBIAN_PACKAGE_CONTROL_STRICT_PERMISSION TRUE)
45+
endif()
2746

28-
set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
47+
if (FEDORA_FOUND OR REDHAT_FOUND OR CENTOS_FOUND)
48+
set(CPACK_GENERATOR RPM)
2949

30-
set(CPACK_RPM_PACKAGE_GROUP "Amusements/Games")
31-
# -- set(CPACK_RPM_PACKAGE_AUTOREQPROV ON)
32-
set(CPACK_RPM_PACKAGE_AUTOREQ ON)
33-
set(CPACK_RPM_PACKAGE_AUTOPROV YES)
34-
set(CPACK_RPM_PACKAGE_RELEASE_DIST ON)
35-
endif()
50+
set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
3651

37-
include(CPack)
52+
set(CPACK_RPM_PACKAGE_GROUP "Amusements/Games")
53+
# -- set(CPACK_RPM_PACKAGE_AUTOREQPROV ON)
54+
set(CPACK_RPM_PACKAGE_AUTOREQ ON)
55+
set(CPACK_RPM_PACKAGE_AUTOPROV YES)
56+
set(CPACK_RPM_PACKAGE_RELEASE_DIST ON)
3857
endif()
39-
endif()
40-
41-
# TODO: Need to be implemented in future
42-
if (WIN32)
43-
#set(CPACK_GENERATOR NSIS)
44-
endif()
4558

46-
if (APPLE)
47-
#set(CPACK_GENERATOR "DRAGNDROP")
59+
include(CPack)
4860
endif()

‎cmake/utils.cmake

-26
Original file line numberDiff line numberDiff line change
@@ -31,32 +31,6 @@ else (CMAKE_SIZEOF_VOID_P EQUAL 4)
3131
set(ARCH_TYPE x86)
3232
endif()
3333

34-
# Unix system configuration
35-
if (UNIX)
36-
# Try to find specific OS files to determine type of linux distribution
37-
find_file(FEDORA_FOUND fedora-release PATHS /etc)
38-
find_file(REDHAT_FOUND redhat-release inittab.RH PATHS /etc)
39-
find_file(CENTOS_FOUND centos-release PATHS /etc)
40-
# If we found debian then we don't need to check further for ubuntu
41-
# as it uses debian core.
42-
find_file(DEBIAN_FOUND debian_version debconf.conf PATHS /etc)
43-
44-
# --------------------------------------------------
45-
# Uninstall target
46-
# --------------------------------------------------
47-
# To clean system folder from libraries and binaries
48-
# that was installed with `sudo make install`
49-
# just run `sudo make uninstall`
50-
if (NOT TARGET uninstall)
51-
configure_file(
52-
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
53-
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
54-
IMMEDIATE @ONLY)
55-
56-
add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
57-
endif()
58-
endif()
59-
6034
function(set_git_info)
6135
execute_process(COMMAND git rev-parse --verify HEAD
6236
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"

0 commit comments

Comments
 (0)