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