From e8471288c0062d9e887d559a7c6f934bc85ea5ba Mon Sep 17 00:00:00 2001
From: Mathias Preiner <mathias.preiner@gmail.com>
Date: Thu, 16 Aug 2018 18:07:59 -0700
Subject: [PATCH] cmake: Do not set global output directories for binaries and
 libraries.

---
 CMakeLists.txt          | 8 --------
 src/main/CMakeLists.txt | 5 ++++-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 433babb5d..a3f406154 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,14 +123,6 @@ macro(cvc4_set_option var value)
   endif()
 endmacro()
 
-#-----------------------------------------------------------------------------#
-
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-message(STATUS "LIB directory is '${CMAKE_BINARY_DIR}/lib'")
-message(STATUS "BIN directory is '${CMAKE_BINARY_DIR}/bin'")
-
 #-----------------------------------------------------------------------------#
 # User options
 
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 7ac8b1194..b49a28223 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -21,7 +21,10 @@ set(cvc4main_src_files
 
 add_executable(cvc4-main ${cvc4main_src_files})
 target_compile_definitions(cvc4-main PRIVATE -D__BUILDING_CVC4DRIVER)
-set_target_properties(cvc4-main PROPERTIES OUTPUT_NAME cvc4)
+set_target_properties(cvc4-main
+  PROPERTIES
+    OUTPUT_NAME cvc4
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 target_link_libraries(cvc4-main main)
 add_dependencies(cvc4-main token-headers)
 
-- 
2.30.2