Merge pull request #969 from d3x0r/patch-1
authorJohn Kessenich <johnkslang@users.noreply.github.com>
Tue, 4 Jul 2017 17:00:42 +0000 (11:00 -0600)
committerGitHub <noreply@github.com>
Tue, 4 Jul 2017 17:00:42 +0000 (11:00 -0600)
Add option to skip installation

1  2 
OGLCompilersDLL/CMakeLists.txt
SPIRV/CMakeLists.txt
StandAlone/CMakeLists.txt
glslang/CMakeLists.txt
glslang/OSDependent/Unix/CMakeLists.txt
glslang/OSDependent/Windows/CMakeLists.txt
hlsl/CMakeLists.txt

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1,6 -1,7 +1,8 @@@
  add_library(OSDependent STATIC ossource.cpp ../osinclude.h)
 -set_property(TARGET OSDependent PROPERTY FOLDER glslang POSITION_INDEPENDENT_CODE ON)
 +set_property(TARGET OSDependent PROPERTY FOLDER glslang)
 +set_property(TARGET OSDependent PROPERTY POSITION_INDEPENDENT_CODE ON)
  
- install(TARGETS OSDependent
-         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ if(ENABLE_GLSLANG_INSTALL)
+     install(TARGETS OSDependent
+             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif(ENABLE_GLSLANG_INSTALL)
Simple merge