Skip to content

Commit b41f8cb

Browse files
committed
fix: gnuinstall before set installprefix
Log: fix gnuinstall before installprefix
1 parent 5c521ed commit b41f8cb

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ option(DOTEST "option for test" OFF)
1111
# 是否开启单元测试编译
1212
#set(DOTEST ON)
1313

14-
include(GNUInstallDirs)
1514
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
1615
set(CMAKE_INSTALL_PREFIX /usr)
1716
endif ()
1817

18+
include(GNUInstallDirs)
1919
#compile flags
2020
if (CMAKE_BUILD_TYPE MATCHES Debug)
2121
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -Wextra")

debian/rules

100644100755
+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export DH_VERBOSE=1
1414

1515
override_dh_auto_configure:
1616
dh_auto_configure -- \
17-
-DCMAKE_BUILD_TYPE=Release \
18-
-DCMAKE_SAFETYTEST_ARG="CMAKE_SAFETYTEST_ARG_OFF" \
19-
-DAPP_VERSION=$(DEB_VERSION_UPSTREAM) -DVERSION=$(DEB_VERSION_UPSTREAM) LIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)
20-
rm -rf ~/.config/deepin/deepin-system-monitor/config.conf
17+
-DCMAKE_BUILD_TYPE=Release \
18+
-DCMAKE_INSTALL_PREFIX=/usr \
19+
-DCMAKE_SAFETYTEST_ARG="CMAKE_SAFETYTEST_ARG_OFF" \
20+
-DAPP_VERSION=$(DEB_VERSION_UPSTREAM) -DVERSION=$(DEB_VERSION_UPSTREAM) LIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)

0 commit comments

Comments
 (0)