blob: 8838a97809d40aefe7129014a2a92989a80a9e64 (
plain)
1 diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt
2 index af4ab587..e0096743 100644
3 --- a/OGLCompilersDLL/CMakeLists.txt
4 +++ b/OGLCompilersDLL/CMakeLists.txt
5 @@ -11,5 +11,5 @@ endif(WIN32)
6 if(ENABLE_GLSLANG_INSTALL)
7 install(TARGETS OGLCompiler EXPORT OGLCompilerTargets
8 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
9 - install(EXPORT OGLCompilerTargets DESTINATION lib/cmake)
10 + install(EXPORT OGLCompilerTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
11 endif(ENABLE_GLSLANG_INSTALL)
12 diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
13 index e25ec0a1..364f04cc 100644
14 --- a/SPIRV/CMakeLists.txt
15 +++ b/SPIRV/CMakeLists.txt
16 @@ -91,8 +91,8 @@ if(ENABLE_GLSLANG_INSTALL)
17 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
18 endif()
19
20 - install(EXPORT SPVRemapperTargets DESTINATION lib/cmake)
21 - install(EXPORT SPIRVTargets DESTINATION lib/cmake)
22 + install(EXPORT SPVRemapperTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
23 + install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
24
25 install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
26 endif(ENABLE_GLSLANG_INSTALL)
27 diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
28 index 0878965c..d9d71d1a 100644
29 --- a/StandAlone/CMakeLists.txt
30 +++ b/StandAlone/CMakeLists.txt
31 @@ -49,12 +49,12 @@ if(ENABLE_GLSLANG_INSTALL)
32 install(TARGETS spirv-remap EXPORT spirv-remapTargets
33 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
34
35 - install(EXPORT glslangValidatorTargets DESTINATION lib/cmake)
36 - install(EXPORT spirv-remapTargets DESTINATION lib/cmake)
37 + install(EXPORT glslangValidatorTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
38 + install(EXPORT spirv-remapTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
39
40 if(BUILD_SHARED_LIBS)
41 install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets
42 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
43 - install(EXPORT glslang-default-resource-limitsTargets DESTINATION lib/cmake)
44 + install(EXPORT glslang-default-resource-limitsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
45 endif()
46 endif(ENABLE_GLSLANG_INSTALL)
47 diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
48 index 42df1d1e..446cabb9 100644
49 --- a/glslang/CMakeLists.txt
50 +++ b/glslang/CMakeLists.txt
51 @@ -112,7 +112,7 @@ if(ENABLE_GLSLANG_INSTALL)
52 install(TARGETS glslang EXPORT glslangTargets
53 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
54 endif()
55 - install(EXPORT glslangTargets DESTINATION lib/cmake)
56 + install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
57 endif(ENABLE_GLSLANG_INSTALL)
58
59 if(ENABLE_GLSLANG_INSTALL)
60 diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt
61 index 91fb45a7..9994314f 100644
62 --- a/glslang/OSDependent/Unix/CMakeLists.txt
63 +++ b/glslang/OSDependent/Unix/CMakeLists.txt
64 @@ -22,5 +22,5 @@ endif()
65 if(ENABLE_GLSLANG_INSTALL)
66 install(TARGETS OSDependent EXPORT OSDependentTargets
67 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
68 - install(EXPORT OSDependentTargets DESTINATION lib/cmake)
69 + install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
70 endif(ENABLE_GLSLANG_INSTALL)
71 diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt
72 index f6bd4e9d..c050ef61 100644
73 --- a/glslang/OSDependent/Windows/CMakeLists.txt
74 +++ b/glslang/OSDependent/Windows/CMakeLists.txt
75 @@ -17,5 +17,5 @@ endif(WIN32)
76 if(ENABLE_GLSLANG_INSTALL)
77 install(TARGETS OSDependent EXPORT OSDependentTargets
78 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
79 - install(EXPORT OSDependentTargets DESTINATION lib/cmake)
80 + install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
81 endif(ENABLE_GLSLANG_INSTALL)
82 diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt
83 index 77d217f1..aadf9a54 100644
84 --- a/gtests/CMakeLists.txt
85 +++ b/gtests/CMakeLists.txt
86 @@ -33,7 +33,7 @@ if(BUILD_TESTING)
87 if(ENABLE_GLSLANG_INSTALL)
88 install(TARGETS glslangtests EXPORT glslangtestsTargets
89 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
90 - install(EXPORT glslangtestsTargets DESTINATION lib/cmake)
91 + install(EXPORT glslangtestsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
92 endif(ENABLE_GLSLANG_INSTALL)
93
94 set(GLSLANG_TEST_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../Test")
95 diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt
96 index 44f9d6a2..ae0d4d4e 100644
97 --- a/hlsl/CMakeLists.txt
98 +++ b/hlsl/CMakeLists.txt
99 @@ -41,5 +41,5 @@ if(ENABLE_GLSLANG_INSTALL)
100 install(TARGETS HLSL EXPORT HLSLTargets
101 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
102 endif()
103 - install(EXPORT HLSLTargets DESTINATION lib/cmake)
104 + install(EXPORT HLSLTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
105 endif(ENABLE_GLSLANG_INSTALL)
|
