From da04d2ce2da0c526d943af8e44ae9ed7909e75ad Mon Sep 17 00:00:00 2001
From: Simon Oehrl <oehrl@vr.rwth-aachen.de>
Date: Thu, 16 Aug 2018 09:14:20 -0700
Subject: [PATCH] Remove the manual conan code
#2
---
CMakeLists.txt | 45 +++++++++++++++++++++------------------------
1 file changed, 21 insertions(+), 24 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2cdd230..10bdba5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -179,6 +179,27 @@ execute_process(
OUTPUT_STRIP_TRAILING_WHITESPACE
)
+#--------------------------------------------------------------------
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+include(ConanHelpers)
+include(CTest)
+include(GenerateExportHeader)
+include(rwthvr)
+
+enable_testing()
+
+conan_or_find_package(catch REQUIRED)
+conan_or_find_package(contra REQUIRED)
+conan_or_find_package(nesci REQUIRED)
+
+conan_or_find_package(cpplint REQUIRED)
+include(cpplint)
+
+conan_or_find_package(cppcheck REQUIRED)
+include(cppcheck)
+add_subdirectory(demos)
+#--------------------------------------------------------------------
+
# on OS X
set( CMAKE_MACOSX_RPATH ON )
@@ -231,9 +252,6 @@ add_custom_target( dist
COMMENT "Creating a source distribution from ${MODULE_NAME}..."
)
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup( TARGETS )
-
if ( BUILD_SHARED_LIBS )
# When building shared libraries, also create a module for loading at runtime
# with the `Install` command.
@@ -296,27 +314,6 @@ if ( NOT CMAKE_CROSSCOMPILING )
)
endif ()
-#--------------------------------------------------------------------
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-include(ConanHelpers)
-include(CTest)
-include(GenerateExportHeader)
-include(rwthvr)
-
-enable_testing()
-
-conan_or_find_package(catch REQUIRED)
-conan_or_find_package(contra REQUIRED)
-conan_or_find_package(nesci REQUIRED)
-
-conan_or_find_package(cpplint REQUIRED)
-include(cpplint)
-
-conan_or_find_package(cppcheck REQUIRED)
-include(cppcheck)
-add_subdirectory(demos)
-#--------------------------------------------------------------------
-
message( "" )
message( "-------------------------------------------------------" )
message( "${MODULE_NAME} Configuration Summary" )
--
GitLab