From 24b46af48a00a21dc9506d50caa77823dd20a1fb Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <github@benoitblanchon.fr>
Date: Thu, 16 Oct 2014 21:29:59 +0200
Subject: [PATCH] Moved build output to bin/ and lib/

---
 .gitignore     | 14 ++------------
 CMakeLists.txt |  4 ++++
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index c5f29b1a..98e8c2c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,5 @@
-*.sdf
-*.user
-*.suo
-*.opensdf
-*.vcxproj
-*.vcxproj.filters
-*.sln
-*.cmake
-*.stamp
-*.stamp.depend
 .DS_Store
-Debug
-ipch
 /.idea
 /build
+/bin
+/lib
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 103d3a6f..c0b54675 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,5 +3,9 @@ project(ArduinoJson)
 
 enable_testing()
 
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
+
 add_subdirectory(src)
 add_subdirectory(test)
\ No newline at end of file