Permalink
Browse files

Install libraries to lib and let platform symlinks determine actual l…

…ocation - fixes #382

Signed-off-by: Benn Snyder <benn.snyder@gmail.com>
  • Loading branch information...
1 parent cb0254a commit 935a998f13ce377cd8f4c2c13e2d1cbf0bde8e1a @piedar piedar committed Apr 15, 2014
Showing with 2 additions and 12 deletions.
  1. +2 −12 cmake_modules/SetupDirectories.cmake
@@ -5,21 +5,11 @@ ELSE (PROJECT_OS_WIN)
SET (CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation directory")
ENDIF (PROJECT_OS_WIN)
-MESSAGE (STATUS "${PROJECT_NAME} will be installed to ${CMAKE_INSTALL_PREFIX}")
-
-# Installation prefix for include files
STRING (TOLOWER ${PROJECT_NAME} projectNameLower)
SET (PROJECT_INCLUDE_INSTALL_DIR "include/${projectNameLower}")
SET (PROJECT_MANPAGE_INSTALL_DIR "share/man")
+SET (PROJECT_LIBRARY_INSTALL_DIR "lib")
-IF (PROJECT_PROC_64BIT)
- SET (LIB_SUFFIX "64" CACHE STRING "Suffix for library installation directory")
-ELSE (PROJECT_PROC_64BIT)
- SET (LIB_SUFFIX "" CACHE STRING "Suffix for library installation directory")
-ENDIF (PROJECT_PROC_64BIT)
-
-SET (PROJECT_LIBRARY_INSTALL_DIR "lib${LIB_SUFFIX}")
-
+MESSAGE (STATUS "${PROJECT_NAME} will be installed to ${CMAKE_INSTALL_PREFIX}")
MESSAGE (STATUS "Headers will be installed to ${CMAKE_INSTALL_PREFIX}/${PROJECT_INCLUDE_INSTALL_DIR}")
MESSAGE (STATUS "Libraries will be installed to ${CMAKE_INSTALL_PREFIX}/${PROJECT_LIBRARY_INSTALL_DIR}")
-

0 comments on commit 935a998

Please sign in to comment.