diff options
| author | mvglasow <michael -at- vonglasow.com> | 2018-06-11 00:02:12 +0200 |
|---|---|---|
| committer | mvglasow <michael -at- vonglasow.com> | 2018-06-11 00:02:12 +0200 |
| commit | aea6489afff65b85593db83fe8a661bceb80147c (patch) | |
| tree | 5591b0c618d2a33584f3542628744af4e3bf38ef /CMakeLists.txt | |
| parent | ad318d7fec18389e9cf1810b7470c4cf1377f836 (diff) | |
| parent | 07006013135b619029f26df579a0ac6acb86cd4a (diff) | |
| download | navit-aea6489afff65b85593db83fe8a661bceb80147c.tar.gz | |
Merge branch 'trunk' into traffic
# Conflicts:
# navit/binding/dbus/binding_dbus.c
# navit/gui/internal/gui_internal_html.c
# navit/route.c
# navit/util.c
# navit/xmlconfig.c
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3400c41e4..c9ae2039d 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=<value>") # 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") |