Fixes for lib64 and qwt6

srsran · Jan 6, 2016 · 9ebf8f4 · 9ebf8f4
1 parent 86b1094
commit 9ebf8f4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,8 +37,20 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/include)
 ########################################################################
 # Install Dirs
 ########################################################################
+if (NOT CMAKE_INSTALL_LIBDIR)
+  include(GNUInstallDirs)
+endif (NOT CMAKE_INSTALL_LIBDIR)
+
+# Fall back to just "lib" if the item provided by GNUInstallDirs doesn't exist
+# For example, on Ubuntu 13.10 with CMake 2.8.11.2,
+# /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE} doesn't exist.
+if (NOT EXISTS "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+  message(STATUS "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} does not exist. Defaulting install location to ${CMAKE_INSTALL_PREFIX}/lib.")
+  set(CMAKE_INSTALL_LIBDIR lib)
+endif()
+
 SET(RUNTIME_DIR bin)
-SET(LIBRARY_DIR lib)
+SET(LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR})
 SET(INCLUDE_DIR include)
 
 ########################################################################

diff --git a/cmake/modules/FindQwt.cmake b/cmake/modules/FindQwt.cmake
@@ -41,6 +41,7 @@ FIND_PATH(QWT_INCLUDE_DIR qwt.h
   /usr/include/qwt
   /usr/include/qwt-qt4
   /usr/include/qwt5
+  /usr/include/qwt6
   /usr/include
   /opt/local/include/qwt #macports path
   $ENV{QWT_DIR}/include