Skip to content
Snippets Groups Projects
Commit 7ae08a58 authored by Jan Müller's avatar Jan Müller
Browse files

remove redundant contra findpackage

#1
parent 64d0a223
No related branches found
No related tags found
No related merge requests found
......@@ -298,25 +298,25 @@ endif ()
#--------------------------------------------------------------------
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
include(ConanHelpers)
#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(catch REQUIRED)
conan_or_find_package(cpplint REQUIRED)
include(cpplint)
conan_or_find_package(cppcheck REQUIRED)
include(cppcheck)
#conan_or_find_package(cpplint REQUIRED)
#include(cpplint)
#conan_or_find_package(cppcheck REQUIRED)
#include(cppcheck)
option(BUILD_VTK_DEMO "Build with VTK demo" OFF)
if (BUILD_VTK_DEMO)
add_subdirectory(demos)
endif(BUILD_VTK_DEMO)
#--------------------------------------------------------------------
message( "" )
......
......@@ -26,14 +26,15 @@ class nest(ConanFile):
description = """NEST is a simulator for spiking neural network models that focuses on the dynamics, size and structure of neural systems rather than on the exact morphology of individual neurons."""
settings = "os", "compiler", "build_type", "arch"
requires = (("contra/18.05@RWTH-VR/develop"),
requires = (("contra/18.07@RWTH-VR/develop"),
("nesci/18.05@RWTH-VR/develop"),
("Qt/5.11.1@bincrafters/stable"),
#("Qt/5.11.1@bincrafters/stable"),
("conduit/0.3.1@RWTH-VR/thirdparty"))
generators = "cmake"
def configure(self):
pass
self.options["contra"].with_transport_boost_shared_memory = False
self.options["contra"].with_transport_zeromq = True
def imports(self):
pass
......@@ -19,7 +19,7 @@
# limitations under the License.
#-------------------------------------------------------------------------------
conan_or_find_package(Qt REQUIRED)
#conan_or_find_package(Qt REQUIRED)
#add_subdirectory(qvtk-app)
add_subdirectory(qvtk-lib)
......@@ -40,8 +40,8 @@ rwthvr_add_library(NAME qvtk-lib
)
target_include_directories(qvtk-lib
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/include
)
generate_export_header(qvtk-lib
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment