Include multi config conan into cmake

closes #151

CMakeLists.txt

@@ -34,6 +34,7 @@ include(Testing)
 
 include(ConfigureFiles)
 
+conan_or_find_package(cpplint REQUIRED)
 include(cpplint)
 
 include(GenerateExportHeader)
@@ -49,6 +50,7 @@ find_package(OpenGL REQUIRED)
 conan_or_find_package(SDL2 REQUIRED)
 conan_or_find_package(freeimage REQUIRED)
 
+
 add_subdirectory(library)
 add_subdirectory(tests)
 add_subdirectory(demos)

cmake/ConanHelpers.cmake

@@ -38,10 +38,23 @@ else()
   )
 endif()
 
+#we reset CONAN_BUILD_INFO, so it is searched everytime, e.g. if we want to change from multi to a specific config
+set (CONAN_BUILD_INFO "CONAN_BUILD_INFO-NOTFOUND")
 find_file(CONAN_BUILD_INFO conanbuildinfo_multi.cmake
   NO_DEFAULT_PATH
   PATHS ${CMAKE_BINARY_DIR}
 )
+if(${CONAN_BUILD_INFO} STREQUAL  "CONAN_BUILD_INFO-NOTFOUND")
+	find_file(CONAN_BUILD_INFO conanbuildinfo.cmake
+	  NO_DEFAULT_PATH
+	  PATHS ${CMAKE_BINARY_DIR}
+	)
+	if(NOT ${CONAN_BUILD_INFO} STREQUAL  "CONAN_BUILD_INFO-NOTFOUND")
+		set( USE_NOT_MULTI_CONAN_BUILD_INFO TRUE)
+	endif()
+endif()
+
+
 if(USE_CONAN AND NOT CONAN_BUILD_INFO)
   message(FATAL_ERROR
     " Error using conan:\n"
@@ -49,33 +62,14 @@ if(USE_CONAN AND NOT CONAN_BUILD_INFO)
     "   Aborting.")
 endif()
 
-# copied from conanbuildinfo
-# TODO(@tvierjahn) can be removed once call to conan_output_dirs_setup()
-# can be disabled
-# see https://github.com/conan-io/conan/issues/1448
-macro(conan_basic_setup_custom)
-    if(CONAN_EXPORTED)
-        message(STATUS "Conan: called by CMake conan helper")
-    endif()
-    conan_check_compiler()
-    #conan_output_dirs_setup()
-    conan_set_find_library_paths()
-    if(NOT "${ARGV0}" STREQUAL "TARGETS")
-        message(STATUS "Conan: Using cmake global configuration")
-        conan_global_flags()
-    else()
-        message(STATUS "Conan: Using cmake targets configuration")
-        conan_define_targets()
-    endif()
-    conan_set_rpath()
-    conan_set_vs_runtime()
-    conan_set_libcxx()
-    conan_set_find_paths()
-endmacro()
 
 if(USE_CONAN AND CONAN_BUILD_INFO)
-  include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-  conan_basic_setup_custom(TARGETS)
+  include(${CONAN_BUILD_INFO})
+  if(USE_NOT_MULTI_CONAN_BUILD_INFO)
+	conan_basic_setup(TARGETS NO_OUTPUT_DIRS)
+  else()
+    conan_basic_setup(TARGETS)
+  endif()
 endif()
 
 macro(CONAN_OR_FIND_PACKAGE package)

cmake/cpplint.cmake

@@ -44,7 +44,7 @@ endif()
 
 find_file(CPPLINT_COMMAND cpplint.py
   PATHS ${CONAN_CPPLINT_DIR}
-  #$ENV{PATH} $ENV{CPPLINT_DIR}
+  $ENV{PATH} $ENV{CPPLINT_DIR}
 )
 if(NOT CPPLINT_COMMAND)
   message(SEND_ERROR