[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [qca] /: cmake: put APPLE block after basic variables
From:       Ivan Romanov <drizt () land ! ru>
Date:       2013-10-01 1:10:57
Message-ID: E1VQoUL-0004fB-18 () scm ! kde ! org
[Download RAW message or body]

Git commit 728a2de655a1bef0e701996cbba44eefb0600583 by Ivan Romanov.
Committed on 01/10/2013 at 01:07.
Pushed by iromanov into branch 'master'.

cmake: put APPLE block after basic variables

M  +12   -13   CMakeLists.txt

http://commits.kde.org/qca/728a2de655a1bef0e701996cbba44eefb0600583

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42d6d7c..a82e155 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,19 +53,6 @@ endif(QCA_LIB_SUFFIX)
 set(QCA_LIB_VERSION_STRING "${QCA_LIB_MAJOR_VERSION}.${QCA_LIB_MINOR_VERSI=
ON}.${QCA_LIB_PATCH_VERSION}")
 =

 =

-if (APPLE)
-   find_package(Carbon REQUIRED)
-   set(CMAKE_INSTALL_NAME_DIR ${QCA_LIBRARY_INSTALL_DIR})
-   set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-endif (APPLE)
-
-# set up RPATH handling, so the libs are found if they are installed to a =
non-standard location, Alex
-if (UNIX  AND NOT  APPLE)
-  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
-  set(CMAKE_INSTALL_RPATH   "${QCA_LIBRARY_INSTALL_DIR}" )
-endif (UNIX  AND NOT  APPLE)
-
-
 if (WIN32)
  set(CMAKE_DEBUG_POSTFIX "d")
  add_definitions(-DWIN32_LEAN_AND_MEAN)
@@ -118,6 +105,18 @@ endif( QCA_INSTALL_IN_QT_PREFIX )
 =

 set(PKGCONFIG_INSTALL_PREFIX "${QCA_LIBRARY_INSTALL_DIR}/pkgconfig" CACHE =
PATH "Base directory for pkgconfig files")
 =

+if (APPLE)
+   find_package(Carbon REQUIRED)
+   set(CMAKE_INSTALL_NAME_DIR ${QCA_LIBRARY_INSTALL_DIR})
+   set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+endif (APPLE)
+
+# set up RPATH handling, so the libs are found if they are installed to a =
non-standard location, Alex
+if (UNIX  AND NOT  APPLE)
+  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
+  set(CMAKE_INSTALL_RPATH   "${QCA_LIBRARY_INSTALL_DIR}" )
+endif (UNIX  AND NOT  APPLE)
+
 message(STATUS "Checking for certstore..")
 # fixme add OR mac
 if( WIN32 )
[prev in list] [next in list] [prev in thread] [next in thread]