r16362 by malex - completely override RPATH when WANT_NORPATH OR WANT_DISTROBUILD are requested

[scribus-commit]

Author: malex
Date: Mon Feb 14 23:20:25 2011
New Revision: 16362

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16362
Log:
completely override RPATH when WANT_NORPATH OR WANT_DISTROBUILD are requested

Modified:
    branches/Version135/Scribus/CMakeLists.txt

Modified: branches/Version135/Scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16362&path=/branches/Version135/Scribus/CMakeLists.txt
==============================================================================
--- branches/Version135/Scribus/CMakeLists.txt (original)
+++ branches/Version135/Scribus/CMakeLists.txt Mon Feb 14 23:20:25 2011
@@ -19,15 +19,16 @@
 SET(CMAKE_VERBOSE_MAKEFILE OFF)
 #Include current dir
 SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
+
 #RPATH setup - more below too
 IF (WANT_NORPATH OR WANT_DISTROBUILD)
-  SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+    SET(CMAKE_SKIP_RPATH TRUE)
 ELSE (WANT_NORPATH OR WANT_DISTROBUILD)
-  SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+    SET(CMAKE_SKIP_BUILD_RPATH TRUE)
+    SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+    SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+    SET(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
 ENDIF (WANT_NORPATH OR WANT_DISTROBUILD)
-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-SET(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
-SET(CMAKE_SKIP_BUILD_RPATH TRUE)
 
 INCLUDE(CheckIncludeFile)
 INCLUDE(CheckCCompilerFlag)