Merge pull request #13 from thclark/v0.0.2

V0.0.2

Author: thclark

.gitignore

@@ -1,7 +1,6 @@
 ####################### Build directories
-build/
-lib/
-bin/
+lib
+bin
 cmake-build-debug
 cmake-build-release
 

.gitmodules

@@ -1,6 +0,0 @@
-[submodule "source/cpr"]
-	path = source/cpr
-	url = https://github.com/whoshuu/cpr.git
-[submodule "source/json"]
-	path = source/json
-	url = https://github.com/nlohmann/json.git

CMakeLists.txt

@@ -11,28 +11,16 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 set(CMAKE_VERBOSE_MAKEFILE ON)
 
 
-# Add directories where third party tools exist
-set(THIRD_PARTY_DIR ${CMAKE_SOURCE_DIR}/../thirdparty)
-message("-- Defined THIRD_PARTY_DIR: ${THIRD_PARTY_DIR}")
-
-
-if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
-
-    # Set run-time library building default to static. This only applies to MSVS compiler,
-    # since all google units have default MT.
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
-
-    # If windows, set find_library_suffixes to both static and shared(.lib; .dll)
-    set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_SUFFIX})
-
-endif()
+# Add third party tools required by conan
+message("-- Adding dependencies with conan. Make sure you've called `conan install . --install-folder ${CMAKE_BINARY_DIR}`")
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+conan_basic_setup()
 
 
 # Add include directories so the test routines can pick up the library contents
 include_directories(source)
 
 
-# Add the souce and test directories
+# Add the source and test directories
 add_subdirectory(source)
 add_subdirectory(test)