From 1c76bf611b012776e5b1312cbc850a24cfee70da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20P=C3=B6ppel?= <jpoeppel@techfak.uni-bielefeld.de>
Date: Wed, 18 Sep 2019 14:45:10 +0200
Subject: [PATCH] fixed meta yaml and cmakelists
---
conda.recipe/meta.yaml | 89 ++++++++++++++++++------------------
ipaacalib/cpp/CMakeLists.txt | 4 +-
2 files changed, 46 insertions(+), 47 deletions(-)
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
index 16bd65a..85ffba7 100644
--- a/conda.recipe/meta.yaml
+++ b/conda.recipe/meta.yaml
@@ -1,56 +1,55 @@
{% set protobufversion = "3.8.0" %}
package:
- name: ipaaca
- version: "0.1.1"
+ name: ipaaca
+ version: "0.1.2"
source:
- - path: ../ipaacalib/cpp/
- folder: ipaaca-cpp
- - path: ../ipaacalib/python/
- folder: ipaaca-py
- - path: ../ipaacalib/proto/
- folder: proto
+ - path: ../ipaacalib/cpp
+ folder: ipaaca-cpp
+ - path: ../ipaacalib/proto
+ folder: proto
+ - path: ../ipaacalib/python
+ folder: ipaaca-py
build:
- number: 4
-
+ number: 1
+
requirements:
- build:
- - {{ compiler('cxx') }} 7.3 # [linux]
- - cmake >=3.10
- run:
- - ipaaca-cpp
- - ipaaca-py
+ run:
+ - ipaaca-cpp
+ - ipaaca-py
+
outputs:
- - name: ipaaca-cpp
- script: install_cpp.sh
- requirements:
- host:
- - libprotobuf {{ protobufversion }}
- - mosquitto
- - libboost
-
- run:
- - mosquitto
- - {{ pin_compatible('libprotobuf', max_pin='x.x') }}
- - libboost
-
- - name: ipaaca-py
- noarch: python
- script: install_python.sh
- requirements:
- host:
- - python
- - pip
- - setuptools
- - protobuf {{ protobufversion }}
-
- run:
- - python
- - mosquitto
- - paho-mqtt
- - {{ pin_compatible('protobuf', max_pin='x.x') }}
-
\ No newline at end of file
+ - name: ipaaca-cpp
+ script: install_cpp.sh
+ requirements:
+ build:
+ - {{ compiler('c') }}
+ - {{ compiler('cxx') }}
+ - cmake >=3.10
+ host:
+ - libprotobuf {{ protobufversion }}
+ - mosquitto
+ - libboost
+ run:
+ - mosquitto
+ - libprotobuf {{ protobufversion }}
+ - libboost
+
+ - name: ipaaca-py
+ noarch: python
+ script: install_python.sh
+ requirements:
+ host:
+ - python
+ - pip
+ - setuptools
+ - protobuf {{ protobufversion }}
+ run:
+ - python
+ - mosquitto
+ - paho-mqtt
+ - protobuf {{ protobufversion }}
diff --git a/ipaacalib/cpp/CMakeLists.txt b/ipaacalib/cpp/CMakeLists.txt
index edf8071..ec4cdbd 100644
--- a/ipaacalib/cpp/CMakeLists.txt
+++ b/ipaacalib/cpp/CMakeLists.txt
@@ -3,10 +3,10 @@ cmake_minimum_required (VERSION 2.6)
# project name
project (ipaaca_cpp)
-set (CMAKE_CXX_STANDARD 11)
+#set (CMAKE_CXX_STANDARD 11)
## use C++11 (starting with proto v2 / ipaaca-c++ release 12)
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
## use the following line to enable console debug messages in ipaaca
## (this entails a slight slowdown since dynamic log level checks made at the very least)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIPAACA_DEBUG_MESSAGES")
--
GitLab