Skip to content
Snippets Groups Projects
Commit da04d2ce authored by Simon Oehrl's avatar Simon Oehrl
Browse files

Remove the manual conan code

#2
parent 10e8f45b
No related branches found
No related tags found
2 merge requests!3Feature/#7 remove conan,!2Feature/#2 add brunel simulation demo
......@@ -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" )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment