Commits (6)
......@@ -2,9 +2,13 @@ set(boost_platform_options)
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT
(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND
CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10.0.1.10010046))
# Set the platform to be clang if using it.
# Set the toolset to be clang if using it.
list(APPEND boost_platform_options
toolset=clang)
elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
# Set the toolset to be GCC if using it.
list(APPEND boost_platform_options
toolset=gcc)
endif ()
if (cxx11_enabled)
......
......@@ -6,7 +6,7 @@ endif ()
superbuild_add_project(freetype
CAN_USE_SYSTEM
DEPENDS zlib
DEPENDS zlib png
CONFIGURE_COMMAND
<SOURCE_DIR>/configure
--prefix=<INSTALL_DIR>
......
......@@ -13,7 +13,7 @@ elseif (NOT MSVC_VERSION VERSION_GREATER 1800)
set(msvc_ver 12.0)
elseif (NOT MSVC_VERSION VERSION_GREATER 1900)
set(msvc_ver 14.0)
elseif (NOT MSVC_VERSION VERSION_GREATER 1910)
elseif (NOT MSVC_VERSION VERSION_GREATER 1919)
set(msvc_ver 14.1)
elseif (NOT MSVC_VERSION VERSION_GREATER 1930)
set(msvc_ver 14.2)
......