Improved CMake correction. The library files are now installed in the correct directo...

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@5094 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt
index 08f3f8b..af52c0b 100755 (executable)
--- a/navit/CMakeLists.txt
+++ b/navit/CMakeLists.txt
@@ -30,22 +30,18 @@ set(SHARE_DIR share/navit)
 set(LOCALE_DIR share/locale)
 set(IMAGE_DIR share/navit/xpm)
 # LIB_DIR
-IF(UNIX AND NOT ANDROID)
+IF(UNIX AND NOT ANDROID AND NOT APPLE)
     IF (NOT LIBDIR)
         MESSAGE(STATUS "LIBDIR variable is not defined. It will be autodetected now.")
         MESSAGE(STATUS "You can set it manually with -DLIBDIR=<value>")
-        IF (NOT APPLE)
-            # check 64 bit
-            IF (CMAKE_SIZEOF_VOID_P EQUAL 4)
-                SET(LIB_DIR lib)
-                MESSAGE(STATUS "   LIB_DIR (highest subdirectory if LIBDIR) is set to '${LIB_DIR}'")
-            ELSE (CMAKE_SIZEOF_VOID_P EQUAL 4)
-                SET(LIB_DIR lib64)
-                MESSAGE(STATUS "   LIB_DIR (highest subdirectory if LIBDIR) is set to '${LIB_DIR}'")
-            ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4)
-        ELSE (NOT APPLE)
+        # check 64 bit
+        IF (CMAKE_SIZEOF_VOID_P EQUAL 4)
             SET(LIB_DIR lib)
-        ENDIF (NOT APPLE)
+            MESSAGE(STATUS "   LIB_DIR (highest subdirectory if LIBDIR) is set to '${LIB_DIR}'")
+        ELSE (CMAKE_SIZEOF_VOID_P EQUAL 4)
+            SET(LIB_DIR lib64)
+            MESSAGE(STATUS "   LIB_DIR (highest subdirectory if LIBDIR) is set to '${LIB_DIR}'")
+        ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4)
     ELSE (NOT LIBDIR)
         GET_FILENAME_COMPONENT (LIB_DIR ${LIBDIR} NAME)
         MESSAGE(STATUS "   LIB_DIR (highest subdirectory if LIBDIR) is set to '${LIB_DIR}'")