r330 - trunk

[DONOTREPLY at icculus.org]

Author: icculus
Date: 2007-07-02 03:28:35 -0400 (Mon, 02 Jul 2007)
New Revision: 330

Modified:
   trunk/CMakeLists.txt
Log:
Minor CMake cleanup.


Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2007-06-18 21:50:50 UTC (rev 329)
+++ trunk/CMakeLists.txt	2007-07-02 07:28:35 UTC (rev 330)
@@ -62,12 +62,6 @@
 ENDIF(BEOS)
 
 IF(UNIX)
-    # !!! FIXME: probably not safe long-term.
-    # CMake mailing list had this hack for getting rid of -rdynamic:
-    #   http://public.kitware.com/pipermail/cmake/2006-July/010404.html
-    IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-        SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS)
-    ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     ADD_DEFINITIONS(-DPLATFORM_UNIX=1)
     ADD_DEFINITIONS(-DLUA_USE_POSIX=1)
     IF(NOT MACOSX AND NOT BEOS)
@@ -97,6 +91,17 @@
     IF(MOJOSETUP_GCC_HAS_STACKPROT)
         ADD_DEFINITIONS(-fno-stack-protector)
     ENDIF(MOJOSETUP_GCC_HAS_STACKPROT)
+
+    # !!! FIXME: probably not safe long-term.
+    # CMake mailing list had this hack for getting rid of -rdynamic:
+    #   http://public.kitware.com/pipermail/cmake/2006-July/010404.html
+    IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+        SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS)
+        SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS)
+    ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+
+    # Don't use -rpath.
+    SET(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE)
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
 TEST_BIG_ENDIAN(MOJOSETUP_IS_BIGENDIAN)