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
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
Index: ne10-1.2.1/CMakeLists.txt
===================================================================
--- ne10-1.2.1.orig/CMakeLists.txt
+++ ne10-1.2.1/CMakeLists.txt
@@ -140,6 +140,8 @@ elseif(GNULINUX_PLATFORM)
set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfpu=neon")
# Turn on asm optimization for Linux on ARM v7.
set(NE10_ASM_OPTIMIZATION on)
+ # Use Multiarch paths
+ include(GNUInstallDirs)
endif()
elseif(IOS_PLATFORM)
#set minimal target ios version.If not provided this option, Xcode
@@ -189,7 +191,7 @@ if(GNULINUX_PLATFORM)
# package config
set(prefix ${CMAKE_INSTALL_PREFIX})
set(exec_prefix "\${prefix}")
- set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
+ set(libdir ${CMAKE_INSTALL_LIBDIR})
set(includedir "\${prefix}/include")
configure_file(
@@ -198,7 +200,7 @@ if(GNULINUX_PLATFORM)
@ONLY)
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/ne10.pc
- DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
# install rules
install( DIRECTORY inc/
@@ -241,4 +243,4 @@ if(GNULINUX_PLATFORM)
${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
)
-endif()
\ No newline at end of file
+endif()
Index: ne10-1.2.1/modules/CMakeLists.txt
===================================================================
--- ne10-1.2.1.orig/modules/CMakeLists.txt
+++ ne10-1.2.1/modules/CMakeLists.txt
@@ -27,6 +27,7 @@
# Define Function Enabling Macros
include(../cmake/FunctionSwitch.cmake)
+include(GNUInstallDirs)
if(NE10_ARM_HARD_FLOAT)
add_definitions(-DNE10_ENABLE_HF)
@@ -388,7 +389,7 @@ if(NE10_BUILD_STATIC OR ANDROID_PLATFORM
DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../ios/NE10Demo/libs/)
endif(IOS_DEMO)
- install(TARGETS NE10 DESTINATION lib)
+ install(TARGETS NE10 DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
if(NE10_BUILD_SHARED)
@@ -423,5 +424,5 @@ if(NE10_BUILD_SHARED)
)
target_link_libraries(NE10_test m)
- install(TARGETS NE10_shared DESTINATION lib)
+ install(TARGETS NE10_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
|
