Merge branch 'master' into hlsl-frontend

CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 2.8)
 
+enable_testing()
+
 set(CMAKE_INSTALL_PREFIX "install" CACHE STRING "prefix")
 
 project(glslang)
@@ -11,7 +13,7 @@ elseif(UNIX)
     add_definitions(-fPIC)
     add_definitions(-DGLSLANG_OSINCLUDE_UNIX)
 else(WIN32)
-    message("unkown platform")
+    message("unknown platform")
 endif(WIN32)
 
 if(CMAKE_COMPILER_IS_GNUCXX)
@@ -20,8 +22,12 @@ elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
     add_definitions(-std=c++11)
 endif()
 
+# We depend on these for later projects, so they should come first.
+add_subdirectory(External)
+
 add_subdirectory(glslang)
 add_subdirectory(OGLCompilersDLL)
 add_subdirectory(StandAlone)
 add_subdirectory(SPIRV)
 add_subdirectory(hlsl)
+add_subdirectory(gtests)