From: Matthias Maier Date: Fri, 29 Jul 2016 04:23:22 +0000 (-0500) Subject: CMake: Override multi-configuration types locations for MSVC X-Git-Tag: v8.5.0-rc1~827^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36ab248a140334f83fdaf60aef206aa4a7561331;p=dealii.git CMake: Override multi-configuration types locations for MSVC --- diff --git a/cmake/scripts/CMakeLists.txt b/cmake/scripts/CMakeLists.txt index 5db06b730f..565f1c0eee 100644 --- a/cmake/scripts/CMakeLists.txt +++ b/cmake/scripts/CMakeLists.txt @@ -1,6 +1,6 @@ ## --------------------------------------------------------------------- ## -## Copyright (C) 2012 - 2015 by the deal.II authors +## Copyright (C) 2012 - 2016 by the deal.II authors ## ## This file is part of the deal.II library. ## @@ -38,6 +38,13 @@ SET_TARGET_PROPERTIES(expand_instantiations_exe PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${DEAL_II_EXECUTABLE_RELDIR} ) +IF (DEAL_II_MSVC) + SET_TARGET_PROPERTIES(expand_instantiations_exe PROPERTIES + RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${DEAL_II_EXECUTABLE_RELDIR}" + RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${DEAL_II_EXECUTABLE_RELDIR}" + ) +ENDIF() + SET(_scripts ${CMAKE_CURRENT_SOURCE_DIR}/normalize.pl ${CMAKE_CURRENT_SOURCE_DIR}/run_test.cmake