Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 03:48:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5095 from jherico/vs2015

Browse source 
Supporting building on Visual Studio 2015
This commit is contained in:
Andrew Meadows 2015-06-11 13:38:18 -07:00
commit a9e3c5e477
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -53,7 +53,7 @@ else ()
endif () endif ()
endif(WIN32) endif(WIN32)
if (NOT MSVC12) if ((NOT MSVC12) AND (NOT MSVC14))
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X) CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)

10
cmake/macros/SetupExternalsBinaryDir.cmake
View file

@ -14,12 +14,12 @@ macro(SETUP_EXTERNALS_BINARY_DIR)
# get a short name for the generator to use in the path # get a short name for the generator to use in the path
STRING(REGEX REPLACE " " "-" CMAKE_GENERATOR_FOLDER_NAME ${CMAKE_GENERATOR}) STRING(REGEX REPLACE " " "-" CMAKE_GENERATOR_FOLDER_NAME ${CMAKE_GENERATOR})
if (MSVC12) if (MSVC12)
set(CMAKE_GENERATOR_FOLDER_NAME "vc12") set(CMAKE_GENERATOR_FOLDER_NAME "vc12")
else () elseif (MSVC14)
if (CMAKE_GENERATOR_FOLDER_NAME STREQUAL "Unix-Makefiles") set(CMAKE_GENERATOR_FOLDER_NAME "vc14")
set(CMAKE_GENERATOR_FOLDER_NAME "makefiles") elseif(CMAKE_GENERATOR_FOLDER_NAME STREQUAL "Unix-Makefiles")
endif () set(CMAKE_GENERATOR_FOLDER_NAME "makefiles")
endif () endif ()
set(EXTERNALS_BINARY_ROOT_DIR "${CMAKE_CURRENT_BINARY_DIR}/ext") set(EXTERNALS_BINARY_ROOT_DIR "${CMAKE_CURRENT_BINARY_DIR}/ext")