From 7ae08a58835703009e421be06fd75dfaa64db280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=BCller?= <j.mueller@vr.rwth-aachen.de>
Date: Thu, 16 Aug 2018 07:41:42 -0700
Subject: [PATCH] remove redundant contra findpackage
#1
---
CMakeLists.txt | 18 +++++++++---------
conanfile.py | 7 ++++---
demos/QVTK-Demo/CMakeLists.txt | 2 +-
demos/QVTK-Demo/qvtk-lib/CMakeLists.txt | 4 ++--
4 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0dc932d..e2d0f2d 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 f1566ae..d077634 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 01b873f..9a77e43 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 984e636..a204f35 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
--
GitLab