diff --git a/CMakeLists.txt b/CMakeLists.txt index 0dc932d3ee68b27f699b1f1b01e0ea47d8c6127e..e2d0f2d00603adfe40637d74b5381fed5e8ea165 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) -add_subdirectory(demos) +if (BUILD_VTK_DEMO) + add_subdirectory(demos) +endif(BUILD_VTK_DEMO) #-------------------------------------------------------------------- message( "" ) diff --git a/conanfile.py b/conanfile.py index f1566ae334b2533288aaddf5cdadbe83d9a9f2c9..d07763488e253860b9ba3cafeb2bba0c18da744c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -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 diff --git a/demos/QVTK-Demo/CMakeLists.txt b/demos/QVTK-Demo/CMakeLists.txt index 01b873f0e67b655df7632f46d274b2396fd3c354..9a77e43cced096dfaf0575d33ae4958908e1b08c 100644 --- a/demos/QVTK-Demo/CMakeLists.txt +++ b/demos/QVTK-Demo/CMakeLists.txt @@ -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) diff --git a/demos/QVTK-Demo/qvtk-lib/CMakeLists.txt b/demos/QVTK-Demo/qvtk-lib/CMakeLists.txt index 984e636828f71211d6bf54d4e4f58128560ac4fa..a204f35ff1cc0675fb4d4d60fc450cf055315159 100644 --- a/demos/QVTK-Demo/qvtk-lib/CMakeLists.txt +++ b/demos/QVTK-Demo/qvtk-lib/CMakeLists.txt @@ -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