Skip to content

Commit 935a998

Browse files
committed
Install libraries to lib and let platform symlinks determine actual location - fixes #382
Signed-off-by: Benn Snyder <[email protected]>
1 parent cb0254a commit 935a998

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

cmake_modules/SetupDirectories.cmake

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,11 @@ ELSE (PROJECT_OS_WIN)
55
SET (CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation directory")
66
ENDIF (PROJECT_OS_WIN)
77

8-
MESSAGE (STATUS "${PROJECT_NAME} will be installed to ${CMAKE_INSTALL_PREFIX}")
9-
10-
# Installation prefix for include files
118
STRING (TOLOWER ${PROJECT_NAME} projectNameLower)
129
SET (PROJECT_INCLUDE_INSTALL_DIR "include/${projectNameLower}")
1310
SET (PROJECT_MANPAGE_INSTALL_DIR "share/man")
11+
SET (PROJECT_LIBRARY_INSTALL_DIR "lib")
1412

15-
IF (PROJECT_PROC_64BIT)
16-
SET (LIB_SUFFIX "64" CACHE STRING "Suffix for library installation directory")
17-
ELSE (PROJECT_PROC_64BIT)
18-
SET (LIB_SUFFIX "" CACHE STRING "Suffix for library installation directory")
19-
ENDIF (PROJECT_PROC_64BIT)
20-
21-
SET (PROJECT_LIBRARY_INSTALL_DIR "lib${LIB_SUFFIX}")
22-
13+
MESSAGE (STATUS "${PROJECT_NAME} will be installed to ${CMAKE_INSTALL_PREFIX}")
2314
MESSAGE (STATUS "Headers will be installed to ${CMAKE_INSTALL_PREFIX}/${PROJECT_INCLUDE_INSTALL_DIR}")
2415
MESSAGE (STATUS "Libraries will be installed to ${CMAKE_INSTALL_PREFIX}/${PROJECT_LIBRARY_INSTALL_DIR}")
25-

0 commit comments

Comments
 (0)