aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRui Abreu Ferreira <raf-ep@gmx.com>2016-01-09 02:40:57 +0000
committerSeth Jackson <sethjackson@gmail.com>2016-01-10 14:16:30 -0500
commit1ce329e7dd26c69c9cad70dd8de1138cba6c9e97 (patch)
treec9b7dace79fe4d624bdb85087793fa0de7e07a99
parentdd8812c7cbb8bb3ab884c0f1198dd1fd9a4a26c5 (diff)
downloadrneovim-1ce329e7dd26c69c9cad70dd8de1138cba6c9e97.tar.gz
rneovim-1ce329e7dd26c69c9cad70dd8de1138cba6c9e97.tar.bz2
rneovim-1ce329e7dd26c69c9cad70dd8de1138cba6c9e97.zip
Fix build output paths for Visual Studio generator
The Visual Studio cmake generator creates subdirectories inside the build path for different build configuration. But this breaks some of our cmake scripts, like the help tags installer, that assume the targets are built in that location. Updated CMakeLists.txt to remove extra paths.
-rw-r--r--CMakeLists.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ecc8689cf8..3c12486d4e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -332,9 +332,16 @@ endif()
set(CMAKE_THREAD_PREFER_PTHREAD ON)
find_package(Threads REQUIRED)
+# Place targets in bin/ or lib/ for all build configurations
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+foreach(CFGNAME ${CMAKE_CONFIGURATION_TYPES})
+ string(TOUPPER ${CFGNAME} CFGNAME)
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFGNAME} ${CMAKE_BINARY_DIR}/bin)
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFGNAME} ${CMAKE_BINARY_DIR}/lib)
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFGNAME} ${CMAKE_BINARY_DIR}/lib)
+endforeach()
# Find Lua interpreter
include(LuaHelpers)