Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
glslang
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
glslang
Commits
bd69a4fb
Commit
bd69a4fb
authored
Nov 18, 2019
by
Arfrever Frehtes Taifersar Arahesis
Committed by
Matt Turner
Nov 18, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Respect CMAKE_INSTALL_LIBDIR in installed CMake files
Fixes #1965
parent
f4d46685
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
11 deletions
+11
-11
CMakeLists.txt
OGLCompilersDLL/CMakeLists.txt
+1
-1
CMakeLists.txt
SPIRV/CMakeLists.txt
+2
-2
CMakeLists.txt
StandAlone/CMakeLists.txt
+3
-3
CMakeLists.txt
glslang/CMakeLists.txt
+1
-1
CMakeLists.txt
glslang/OSDependent/Unix/CMakeLists.txt
+1
-1
CMakeLists.txt
glslang/OSDependent/Windows/CMakeLists.txt
+1
-1
CMakeLists.txt
gtests/CMakeLists.txt
+1
-1
CMakeLists.txt
hlsl/CMakeLists.txt
+1
-1
No files found.
OGLCompilersDLL/CMakeLists.txt
View file @
bd69a4fb
...
...
@@ -11,5 +11,5 @@ endif(WIN32)
if
(
ENABLE_GLSLANG_INSTALL
)
install
(
TARGETS OGLCompiler EXPORT OGLCompilerTargets
ARCHIVE DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
install
(
EXPORT OGLCompilerTargets DESTINATION
lib
/cmake
)
install
(
EXPORT OGLCompilerTargets DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
/cmake
)
endif
(
ENABLE_GLSLANG_INSTALL
)
SPIRV/CMakeLists.txt
View file @
bd69a4fb
...
...
@@ -91,8 +91,8 @@ if(ENABLE_GLSLANG_INSTALL)
ARCHIVE DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
endif
()
install
(
EXPORT SPVRemapperTargets DESTINATION
lib
/cmake
)
install
(
EXPORT SPIRVTargets DESTINATION
lib
/cmake
)
install
(
EXPORT SPVRemapperTargets DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
/cmake
)
install
(
EXPORT SPIRVTargets DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
/cmake
)
install
(
FILES
${
HEADERS
}
${
SPVREMAP_HEADERS
}
DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
/SPIRV/
)
install
(
FILES
${
HEADERS
}
${
SPVREMAP_HEADERS
}
DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
/glslang/SPIRV/
)
...
...
StandAlone/CMakeLists.txt
View file @
bd69a4fb
...
...
@@ -49,12 +49,12 @@ if(ENABLE_GLSLANG_INSTALL)
install
(
TARGETS spirv-remap EXPORT spirv-remapTargets
RUNTIME DESTINATION
${
CMAKE_INSTALL_BINDIR
}
)
install
(
EXPORT glslangValidatorTargets DESTINATION
lib
/cmake
)
install
(
EXPORT spirv-remapTargets DESTINATION
lib
/cmake
)
install
(
EXPORT glslangValidatorTargets DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
/cmake
)
install
(
EXPORT spirv-remapTargets DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
/cmake
)
if
(
BUILD_SHARED_LIBS
)
install
(
TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets
LIBRARY DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
install
(
EXPORT glslang-default-resource-limitsTargets DESTINATION
lib
/cmake
)
install
(
EXPORT glslang-default-resource-limitsTargets DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
/cmake
)
endif
()
endif
(
ENABLE_GLSLANG_INSTALL
)
glslang/CMakeLists.txt
View file @
bd69a4fb
...
...
@@ -112,7 +112,7 @@ if(ENABLE_GLSLANG_INSTALL)
install
(
TARGETS glslang EXPORT glslangTargets
ARCHIVE DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
endif
()
install
(
EXPORT glslangTargets DESTINATION
lib
/cmake
)
install
(
EXPORT glslangTargets DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
/cmake
)
endif
(
ENABLE_GLSLANG_INSTALL
)
if
(
ENABLE_GLSLANG_INSTALL
)
...
...
glslang/OSDependent/Unix/CMakeLists.txt
View file @
bd69a4fb
...
...
@@ -22,5 +22,5 @@ endif()
if
(
ENABLE_GLSLANG_INSTALL
)
install
(
TARGETS OSDependent EXPORT OSDependentTargets
ARCHIVE DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
install
(
EXPORT OSDependentTargets DESTINATION
lib
/cmake
)
install
(
EXPORT OSDependentTargets DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
/cmake
)
endif
(
ENABLE_GLSLANG_INSTALL
)
glslang/OSDependent/Windows/CMakeLists.txt
View file @
bd69a4fb
...
...
@@ -17,5 +17,5 @@ endif(WIN32)
if
(
ENABLE_GLSLANG_INSTALL
)
install
(
TARGETS OSDependent EXPORT OSDependentTargets
ARCHIVE DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
install
(
EXPORT OSDependentTargets DESTINATION
lib
/cmake
)
install
(
EXPORT OSDependentTargets DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
/cmake
)
endif
(
ENABLE_GLSLANG_INSTALL
)
gtests/CMakeLists.txt
View file @
bd69a4fb
...
...
@@ -33,7 +33,7 @@ if(BUILD_TESTING)
if
(
ENABLE_GLSLANG_INSTALL
)
install
(
TARGETS glslangtests EXPORT glslangtestsTargets
RUNTIME DESTINATION
${
CMAKE_INSTALL_BINDIR
}
)
install
(
EXPORT glslangtestsTargets DESTINATION
lib
/cmake
)
install
(
EXPORT glslangtestsTargets DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
/cmake
)
endif
(
ENABLE_GLSLANG_INSTALL
)
set
(
GLSLANG_TEST_DIRECTORY
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/../Test"
)
...
...
hlsl/CMakeLists.txt
View file @
bd69a4fb
...
...
@@ -41,5 +41,5 @@ if(ENABLE_GLSLANG_INSTALL)
install
(
TARGETS HLSL EXPORT HLSLTargets
ARCHIVE DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
endif
()
install
(
EXPORT HLSLTargets DESTINATION
lib
/cmake
)
install
(
EXPORT HLSLTargets DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
/cmake
)
endif
(
ENABLE_GLSLANG_INSTALL
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment