From 77f46db797c9bcd5a3fb5a4bdf49bd5645d7a126 Mon Sep 17 00:00:00 2001 From: Alexander Filippov Date: Sat, 5 Apr 2014 21:27:47 +0400 Subject: [PATCH] Support for Visual Studio 2012 --- CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cac8f73..b5fb4adb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,12 +112,14 @@ IF (MINGW) ELSEIF (MSVC) IF (MSVC_VERSION EQUAL 1800) set (CMAKE_GENERATOR_TOOLSET "v120_xp" CACHE STRING "Platform Toolset" FORCE) + set (BOOST_SUFFIX "-vc120-mt-1_55") + ELSEIF (MSVC_VERSION EQUAL 1700) + set (BOOST_SUFFIX "-vc110-mt-1_55") ENDIF () include_directories("${PROJECT_LIBS_DIR}/wxWidgets/lib/vc_lib/mswu") link_directories("${PROJECT_LIBS_DIR}/wxWidgets/lib/vc_lib") - set (CMAKE_CXX_FLAGS "/EHsc") + set (CMAKE_CXX_FLAGS "/EHsc") set (CMAKE_EXE_LINKER_FLAGS "/SUBSYSTEM:WINDOWS") - set (BOOST_SUFFIX "-vc120-mt-1_55") set (LOOT_LIBS ${LOOT_LIBS} libyaml-cppmd libboost_log_setup${BOOST_SUFFIX} @@ -159,5 +161,8 @@ target_link_libraries (LOOT ${LOOT_GUI_LIBS}) # Build converter. add_executable (masterlist-converter ${LOOT_SRC} "${CMAKE_SOURCE_DIR}/src/converter.cpp") +IF (MSVC) + set_target_properties (masterlist-converter PROPERTIES LINK_FLAGS "/SUBSYSTEM:CONSOLE") +ENDIF () target_link_libraries (masterlist-converter ${LOOT_LIBS})