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
KhronosGroup · Mar 11, 2014 · 3ce1058 · 3ce1058
1 parent d18e2d8
commit 3ce1058
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 13 deletions.
diff --git a/BuildLinuxCMake.sh b/BuildLinuxCMake.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
-rm -rf linux_build
-mkdir linux_build
-pushd linux_build
+rm -rf build
+mkdir build
+pushd build
+cmake ..
 cmake ..
 make
-./StandAlone/glslangValidator -i ../Test/sample.vert ../Test/sample.frag
+make install
+install/bin/glslangValidator -i ../Test/sample.vert ../Test/sample.frag
 popd
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 2.8)
 
+set(CMAKE_INSTALL_PREFIX install)
+
 project(glslang)
 
 add_subdirectory(glslang/MachineIndependent)

diff --git a/Install/Linux/glslangValidator b/Install/Linux/glslangValidator
diff --git a/Install/Linux/libglslang.so b/Install/Linux/libglslang.so
diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
@@ -11,15 +11,18 @@ endif(WIN32)
 
 add_executable(glslangValidator StandAlone.cpp)
 
-target_link_libraries(glslangValidator
-                      glslang
-                      GenericCodeGen
-                      OSDependent
-                      Preprocessor
-                      OGLCompiler)
+set(LIBRARIES
+    glslang
+    GenericCodeGen
+    OSDependent
+    Preprocessor
+    OGLCompiler)
+
 if(UNIX)
-    target_link_libraries(${target_link_libraries} pthread)
+    set(LIBRARIES ${LIBRARIES} pthread)
 endif(UNIX)
 
+target_link_libraries(glslangValidator ${LIBRARIES})
+
 install(TARGETS glslangValidator
         RUNTIME DESTINATION bin)
diff --git a/Test/glslangValidator b/Test/glslangValidator