From f759dfe3b54da9daefd636bd9f291a51cc4ccfcf Mon Sep 17 00:00:00 2001 From: Joseph Herlant Date: Sun, 3 Jun 2018 10:00:18 -0700 Subject: Fix:cmake:Fix the way we set the LIB_DIR when LIBDIR is set for backward compatibility (#574) --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 74a2a292e..dd0b93eca 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,15 +48,15 @@ IF(UNIX AND NOT ANDROID AND NOT APPLE) MESSAGE(STATUS "You can set it manually with -DLIBDIR=") # check 64 bit IF (CMAKE_SIZEOF_VOID_P EQUAL 4) - SET(LIB_DIR lib/navit CACHE PATH "Navit 32bit bin path") + SET(LIB_DIR lib/${PACKAGE} CACHE PATH "Navit 32bit bin path") MESSAGE(STATUS " LIB_DIR (highest subdirectory if LIBDIR) is set to '${LIB_DIR}'") ELSE (CMAKE_SIZEOF_VOID_P EQUAL 4) - SET(LIB_DIR lib64/navit CACHE PATH "Navit 64bit bin path") + SET(LIB_DIR lib64/${PACKAGE} CACHE PATH "Navit 64bit bin path") 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}'") + SET (LIB_DIR ${LIBDIR}/${PACKAGE} CACHE PATH "Navit lib path") + MESSAGE(STATUS " LIB_DIR is set to '${LIB_DIR}' because LIBDIR is set to ${LIBDIR}") ENDIF (NOT LIBDIR) ELSE (UNIX AND NOT ANDROID AND NOT APPLE) SET(LIB_DIR lib/navit CACHE PATH "Navit unix bin path") -- cgit v1.2.1