From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 21 Nov 2013 14:55:00 +0000 (+0000)
Subject: Set rpath correctly.
X-Git-Tag: 0.6.0~29
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d963f874aa877a55b1431a414f113fe909184dc2;p=rspamd.git

Set rpath correctly.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b18e6bdb7..38b654449 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,6 +79,19 @@ IF(NOT PLUGINSDIR)
 	SET(PLUGINSDIR "${CMAKE_INSTALL_PREFIX}/share/rspamd")
 ENDIF(NOT PLUGINSDIR)
 
+# Set libdir
+IF(NOT LIBDIR)
+	SET(LIBDIR lib/rspamd)
+	IF(NOT CMAKE_INSTALL_RPATH)
+		SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${LIBDIR})
+	ENDIF(NOT CMAKE_INSTALL_RPATH)
+ENDIF(NOT LIBDIR)
+
+# Set includedir
+IF(NOT INCLUDEDIR)
+	SET(INCLUDEDIR include/rspamd)
+ENDIF(NOT INCLUDEDIR)
+
 ############################# INCLUDE SECTION #############################################
 
 INCLUDE(CheckIncludeFiles)
@@ -343,19 +356,6 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
   	SET(CMAKE_INSTALL_RPATH "${PREFIX}/lib")	
 ENDIF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
 
-# Set libdir
-IF(NOT LIBDIR)
-	SET(LIBDIR lib/rspamd)
-	IF(NOT CMAKE_INSTALL_RPATH)
-		SET(CMAKE_INSTALL_RPATH ${PREFIX}/${LIBDIR})
-	ENDIF(NOT CMAKE_INSTALL_RPATH)
-ENDIF(NOT LIBDIR)
-
-# Set includedir
-IF(NOT INCLUDEDIR)
-	SET(INCLUDEDIR include/rspamd)
-ENDIF(NOT INCLUDEDIR)
-
 # Now find libraries and headers
 
 # Find lua libraries