From 0af1e7c608b7c5f15e38d62f6289ac76002cf62c Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Mon, 17 Mar 2014 23:56:45 +0000 Subject: [PATCH] Allow selection of the "Platform Toolset", so that XP binaries can be built. git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@25952 e7fa87d3-cd2b-0410-9028-fcbf551c1848 --- CMakeLists.txt | 1 + StandAlone/CMakeLists.txt | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f8471a25..6bc0340a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 2.8) set(CMAKE_INSTALL_PREFIX "install" CACHE STRING "prefix" FORCE) +set(CMAKE_GENERATOR_TOOLSET "v110" CACHE STRING "Platform Toolset" FORCE) project(glslang) diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt index fb988112..5e4c671c 100644 --- a/StandAlone/CMakeLists.txt +++ b/StandAlone/CMakeLists.txt @@ -18,9 +18,11 @@ set(LIBRARIES Preprocessor OGLCompiler) -if(UNIX) +if(WIN32) + set(LIBRARIES ${LIBRARIES} psapi) +elseif(UNIX) set(LIBRARIES ${LIBRARIES} pthread) -endif(UNIX) +endif(WIN32) target_link_libraries(glslangValidator ${LIBRARIES})