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
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
|
From f9b71c86098c16436c3a51d8706f52f720ef008d Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Fri, 2 Sep 2016 15:54:49 -0600
Subject: [PATCH] cmake: support multilib
---
CMakeLists.txt | 26 ++++++++++++++++----------
runtime/CMakeLists.txt | 8 ++++----
2 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 726e8e4..181a2bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,12 +20,18 @@ project(Legion)
#------------------------------------------------------------------------------#
# Some boilerplate to setup nice output directories
#------------------------------------------------------------------------------#
+
+#for multilib distros
+if (NOT DEFINED LIB)
+ set(LIB "lib")
+endif(NOT DEFINED LIB)
+
list(INSERT CMAKE_MODULE_PATH 0 "${Legion_SOURCE_DIR}/cmake")
if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${Legion_BINARY_DIR}/lib)
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${Legion_BINARY_DIR}/${LIB})
endif()
if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${Legion_BINARY_DIR}/lib)
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${Legion_BINARY_DIR}/${LIB})
endif()
if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${Legion_BINARY_DIR}/bin)
@@ -50,7 +56,7 @@ option(Legion_USE_HWLOC "Use hwloc for topology awareness" OFF)
if(Legion_USE_HWLOC)
find_package(HWLOC REQUIRED)
install(FILES ${Legion_SOURCE_DIR}/cmake/FindHWLOC.cmake
- DESTINATION lib/cmake/Legion
+ DESTINATION ${LIB}/cmake/Legion
)
endif()
@@ -69,7 +75,7 @@ if(Legion_USE_GASNet)
mark_as_advanced(GASNet_CONDUIT)
find_package(GASNet REQUIRED)
install(FILES ${Legion_SOURCE_DIR}/cmake/FindGASNet.cmake
- DESTINATION lib/cmake/Legion
+ DESTINATION ${LIB}/cmake/Legion
)
endif()
@@ -81,7 +87,7 @@ if(Legion_USE_LLVM)
set(Legion_LLVM_COMPONENTS irreader jit mcjit x86)
find_package(LLVM REQUIRED COMPONENTS ${Legion_LLVM_COMPONENTS})
install(FILES ${Legion_SOURCE_DIR}/cmake/FindLLVM.cmake
- DESTINATION lib/cmake/Legion
+ DESTINATION ${LIB}/cmake/Legion
)
endif()
@@ -97,10 +103,10 @@ if(Legion_USE_CUDA)
endif()
find_package(CUDA REQUIRED)
install(FILES ${Legion_SOURCE_DIR}/cmake/FindCUDA.cmake
- DESTINATION lib/cmake/Legion
+ DESTINATION ${LIB}/cmake/Legion
)
install(FILES ${Legion_SOURCE_DIR}/cmake/newcmake/FindCUDA.cmake
- DESTINATION lib/cmake/Legion/newcmake
+ DESTINATION ${LIB}/cmake/Legion/newcmake
)
endif()
@@ -128,7 +134,7 @@ export(EXPORT LegionTargets
install(EXPORT LegionTargets
NAMESPACE Legion::
FILE LegionTargets.cmake
- DESTINATION lib/cmake/Legion
+ DESTINATION ${LIB}/cmake/Legion
)
configure_file(
@@ -137,7 +143,7 @@ configure_file(
@ONLY
)
install(FILES ${Legion_BINARY_DIR}/LegionConfigCommon.cmake
- DESTINATION lib/cmake/Legion
+ DESTINATION ${LIB}/cmake/Legion
)
configure_file(
@@ -147,7 +153,7 @@ configure_file(
)
install(FILES cmake/LegionConfig-install.cmake
- DESTINATION lib/cmake/Legion
+ DESTINATION ${LIB}/cmake/Legion
RENAME LegionConfig.cmake
)
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index e21e141..91f6a03 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -176,8 +176,8 @@ target_include_directories(LowLevelRuntime
)
install(TARGETS LowLevelRuntime EXPORT LegionTargets
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION ${LIB}
+ ARCHIVE DESTINATION ${LIB}
RUNTIME DESTINATION bin
)
@@ -244,8 +244,8 @@ target_include_directories(HighLevelRuntime
)
install(TARGETS HighLevelRuntime EXPORT LegionTargets
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION ${LIB}
+ ARCHIVE DESTINATION ${LIB}
RUNTIME DESTINATION bin
)
--
2.7.3
|
GitWeb