diff options
| author | liuxueli <[email protected]> | 2022-03-01 17:54:23 +0800 |
|---|---|---|
| committer | liuxueli <[email protected]> | 2022-03-01 17:54:23 +0800 |
| commit | dc5626aceee35dca33163affd287062928bd65c8 (patch) | |
| tree | 1e291f225fb60f53a15942bf185d7696beafd4a7 | |
| parent | 54df5280835937e7cbcd1a750387100a19853556 (diff) | |
设置库文件默认安装路径，否则会与系统的rpm冲突v2.10.6
| -rwxr-xr-x | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | cmake/Package.cmake | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e39e68..3402379 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,10 +9,8 @@ include(Version) set(CMAKE_MACOSX_RPATH 0) set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -Wall) -if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set (CMAKE_INSTALL_PREFIX "/opt/MESA" - CACHE PATH "default install path" FORCE) -endif() +set (CMAKE_INSTALL_PREFIX "/opt/MESA" CACHE PATH "default install path" FORCE) + #for ASAN set(ASAN_OPTION "OFF" CACHE STRING " set asan type chosen by the user, using OFF as default") set_property(CACHE ASAN_OPTION PROPERTY STRINGS OFF ADDRESS THREAD) diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 2be874f..6187cb8 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -41,9 +41,6 @@ set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME}) set(CPACK_COMPONENTS_ALL LIBRARIES HEADER) -set(CPACK_RPM_PACKAGE_AUTOREQPROV "no") -set(CPACK_RPM_PACKAGE_AUTOREQ "no") - set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}") # Must uninstall the debug package before install release package |