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})