diff --git a/CMakeLists.txt b/CMakeLists.txt index 35915fd1..44ce3999 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,11 +11,11 @@ option(DOTEST "option for test" OFF) # 是否开启单元测试编译 #set(DOTEST ON) -include(GNUInstallDirs) if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set(CMAKE_INSTALL_PREFIX /usr) endif () +include(GNUInstallDirs) #compile flags if (CMAKE_BUILD_TYPE MATCHES Debug) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -Wextra") diff --git a/debian/rules b/debian/rules old mode 100644 new mode 100755 index be5575e9..d31a798b --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,7 @@ export DH_VERBOSE=1 override_dh_auto_configure: dh_auto_configure -- \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SAFETYTEST_ARG="CMAKE_SAFETYTEST_ARG_OFF" \ - -DAPP_VERSION=$(DEB_VERSION_UPSTREAM) -DVERSION=$(DEB_VERSION_UPSTREAM) LIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH) - rm -rf ~/.config/deepin/deepin-system-monitor/config.conf \ No newline at end of file + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SAFETYTEST_ARG="CMAKE_SAFETYTEST_ARG_OFF" \ + -DAPP_VERSION=$(DEB_VERSION_UPSTREAM) -DVERSION=$(DEB_VERSION_UPSTREAM) LIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)