diff options
| author | Tomáš Chvátal <scarabeus@gentoo.org> | 2009-12-05 22:24:59 +0100 |
|---|---|---|
| committer | Tomáš Chvátal <scarabeus@gentoo.org> | 2009-12-05 22:24:59 +0100 |
| commit | a0939379bb1185ee6d66739d9d021466d5d89624 (patch) | |
| tree | 6d8430515e8eda88f0f5de1161b019d7d9052ddd | |
| parent | 6a271daec810ba9be24a15c8c92338e9df5724cd (diff) | |
Revert "Force most variables so we enforce their refreshing."
Force behaves bit differently on some versions of cmake...
This reverts commit 6a271daec810ba9be24a15c8c92338e9df5724cd.
| -rw-r--r-- | CMakeLists.txt | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f415d45..91b8813 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,16 +33,16 @@ MARK_AS_ADVANCED ( CROSSCOMPILE ) ############################################################################### SET ( WORKDIR ${CMAKE_SOURCE_DIR}/src ) # data because some distributions want different data placement -SET ( CMAKE_CONF_PATH "/etc" CACHE PATH "Config path prefix" FORCE ) +SET ( CMAKE_CONF_PATH "/etc" CACHE PATH "Config path prefix" ) IF ( PACKAGE ) - SET ( CMAKE_INSTALL_PREFIX "/" CACHE PATH "Install path prefix" FORCE ) + SET ( CMAKE_INSTALL_PREFIX "/" CACHE PATH "Install path prefix" ) ELSE ( PACKAGE ) - SET ( CMAKE_INSTALL_PREFIX "/usr/local/" CACHE PATH "Install path prefix" FORCE ) + SET ( CMAKE_INSTALL_PREFIX "/usr/local/" CACHE PATH "Install path prefix" ) ENDIF ( PACKAGE ) -SET ( CMAKE_LOCALE_PATH "${CMAKE_INSTALL_PREFIX}/share/locale" CACHE PATH "Locale path prefix" FORCE ) -SET ( CMAKE_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/" CACHE PATH "Data path prefix" FORCE ) -SET ( CMAKE_LIB_PATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/" CACHE PATH "Library path prefix" FORCE ) -SET ( LIB_INSTALL_DIR "${CMAKE_LIB_PATH}" FORCE ) +SET ( CMAKE_LOCALE_PATH "${CMAKE_INSTALL_PREFIX}/share/locale" CACHE PATH "Locale path prefix" ) +SET ( CMAKE_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/" CACHE PATH "Data path prefix" ) +SET ( CMAKE_LIB_PATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/" CACHE PATH "Library path prefix" ) +SET ( LIB_INSTALL_DIR "${CMAKE_LIB_PATH}" ) ############################################################################### # BASIC PROJECT VALUES ############################################################################### @@ -72,10 +72,10 @@ ENDIF ( CROSSCOMPILE ) SET ( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" ) #various variables SET ( CMAKE_INSTALL_ETCDIR ${CMAKE_CONF_PATH} ) -SET ( CMAKE_DOC_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/${APPNAME}" CACHE PATH "Doc path prefix" FORCE ) -SET ( CMAKE_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Binary path prefix" FORCE ) -SET ( CMAKE_INSTALL_ICONDIR "${CMAKE_INSTALL_PREFIX}/share/pixmaps" CACHE PATH "Icon path prefix" FORCE ) -SET ( CMAKE_INSTALL_DESKTOPDIR "share/applications" CACHE PATH "Desktop file path prefix" FORCE) +SET ( CMAKE_DOC_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/${APPNAME}" CACHE PATH "Doc path prefix" ) +SET ( CMAKE_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Binary path prefix" ) +SET ( CMAKE_INSTALL_ICONDIR "${CMAKE_INSTALL_PREFIX}/share/pixmaps" CACHE PATH "Icon path prefix" ) +SET ( CMAKE_INSTALL_DESKTOPDIR "share/applications" CACHE PATH "Desktop file path prefix") SET ( CMAKE_INSTALL_LOCALEDIR ${CMAKE_LOCALE_PATH} ) SET ( CMAKE_INSTALL_DATADIR ${CMAKE_DATA_PATH} ) SET ( CMAKE_INSTALL_LIBDIR ${LIB_INSTALL_DIR} ) |