update Linux build for latest CMake changes from Windows
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@25793 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
parent
d18e2d8adc
commit
3ce1058dbe
@ -1,8 +1,10 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
rm -rf linux_build
|
rm -rf build
|
||||||
mkdir linux_build
|
mkdir build
|
||||||
pushd linux_build
|
pushd build
|
||||||
|
cmake ..
|
||||||
cmake ..
|
cmake ..
|
||||||
make
|
make
|
||||||
./StandAlone/glslangValidator -i ../Test/sample.vert ../Test/sample.frag
|
make install
|
||||||
|
install/bin/glslangValidator -i ../Test/sample.vert ../Test/sample.frag
|
||||||
popd
|
popd
|
||||||
|
|||||||
@ -1,5 +1,7 @@
|
|||||||
cmake_minimum_required(VERSION 2.8)
|
cmake_minimum_required(VERSION 2.8)
|
||||||
|
|
||||||
|
set(CMAKE_INSTALL_PREFIX install)
|
||||||
|
|
||||||
project(glslang)
|
project(glslang)
|
||||||
|
|
||||||
add_subdirectory(glslang/MachineIndependent)
|
add_subdirectory(glslang/MachineIndependent)
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@ -11,15 +11,18 @@ endif(WIN32)
|
|||||||
|
|
||||||
add_executable(glslangValidator StandAlone.cpp)
|
add_executable(glslangValidator StandAlone.cpp)
|
||||||
|
|
||||||
target_link_libraries(glslangValidator
|
set(LIBRARIES
|
||||||
glslang
|
glslang
|
||||||
GenericCodeGen
|
GenericCodeGen
|
||||||
OSDependent
|
OSDependent
|
||||||
Preprocessor
|
Preprocessor
|
||||||
OGLCompiler)
|
OGLCompiler)
|
||||||
|
|
||||||
if(UNIX)
|
if(UNIX)
|
||||||
target_link_libraries(${target_link_libraries} pthread)
|
set(LIBRARIES ${LIBRARIES} pthread)
|
||||||
endif(UNIX)
|
endif(UNIX)
|
||||||
|
|
||||||
|
target_link_libraries(glslangValidator ${LIBRARIES})
|
||||||
|
|
||||||
install(TARGETS glslangValidator
|
install(TARGETS glslangValidator
|
||||||
RUNTIME DESTINATION bin)
|
RUNTIME DESTINATION bin)
|
||||||
|
|||||||
@ -1,2 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
../build/install/bin/glslangValidator $*
|
|
||||||
Loading…
x
Reference in New Issue
Block a user