1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
Description: Add support for Multi-Arch to CMake
Author: Olek Wojnar <olekw.dev@gmail.com>
Last-Update: 2019-12-12
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,7 @@
set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
include(CEGUIMacros)
include(CMakeDependentOption)
+include(GNUInstallDirs)
################################################################################
# Set up version information
@@ -645,15 +646,7 @@
set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
# set up install sub-directories
-if (NOT CEGUI_LIB_INSTALL_DIR)
- if (CMAKE_SIZEOF_VOID_P EQUAL 8 AND EXISTS "${CMAKE_INSTALL_PREFIX}/lib64")
- set( CEGUI_LIB_INSTALL_DIR lib64 )
- elseif (CMAKE_SIZEOF_VOID_P EQUAL 4 AND EXISTS "${CMAKE_INSTALL_PREFIX}/lib32")
- set( CEGUI_LIB_INSTALL_DIR lib32 )
- else()
- set( CEGUI_LIB_INSTALL_DIR lib )
- endif()
-endif()
+set( CEGUI_LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" )
set( CEGUI_VER_INSTALL_SUBDIR "/${CMAKE_PROJECT_NAME}-${CEGUI_VERSION_MAJOR}" )
@@ -678,7 +671,7 @@
endif()
if (NOT CEGUI_INCLUDE_INSTALL_DIR)
- set( CEGUI_INCLUDE_INSTALL_DIR "include${CEGUI_VER_INSTALL_SUBDIR}.${CEGUI_VERSION_MINOR}.${CEGUI_VERSION_PATCH}" )
+set( CEGUI_INCLUDE_INSTALL_DIR "include/${CMAKE_LIBRARY_ARCHITECTURE}${CEGUI_VER_INSTALL_SUBDIR}.${CEGUI_VERSION_MINOR}.${CEGUI_VERSION_PATCH}" )
endif()
################################################################################
|
