From abf6e09e51f43dd7aaeab305dbe2f261477364a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20P=C3=B6ppel?= <jpoeppel@techfak.uni-bielefeld.de>
Date: Tue, 21 Jan 2020 09:57:03 +0100
Subject: [PATCH] updaded cpp CMakeLists to work with newer bosot version and
fixed install scripts
---
conda.recipe/build.sh | 2 --
conda.recipe/install_python.sh | 2 +-
conda.recipe/meta.yaml | 4 ++--
ipaacalib/cpp/CMakeLists.txt | 2 +-
4 files changed, 4 insertions(+), 6 deletions(-)
delete mode 100644 conda.recipe/build.sh
diff --git a/conda.recipe/build.sh b/conda.recipe/build.sh
deleted file mode 100644
index 5f015dd..0000000
--- a/conda.recipe/build.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# build protobuf files
-echo 0
\ No newline at end of file
diff --git a/conda.recipe/install_python.sh b/conda.recipe/install_python.sh
index 549a6f5..bcc9697 100644
--- a/conda.recipe/install_python.sh
+++ b/conda.recipe/install_python.sh
@@ -6,4 +6,4 @@
cd ipaaca-py
echo "Installing ipaaca using setup.py"
#python -m pip install . -vv
-python setup.py install --single-version-externally-managed --record=record.txt
\ No newline at end of file
+$PYTHON setup.py install --single-version-externally-managed --record=record.txt
\ No newline at end of file
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
index 85ffba7..62ad06b 100644
--- a/conda.recipe/meta.yaml
+++ b/conda.recipe/meta.yaml
@@ -13,7 +13,7 @@ source:
folder: ipaaca-py
build:
- number: 1
+ number: 2
requirements:
@@ -24,7 +24,7 @@ requirements:
outputs:
- name: ipaaca-cpp
- script: install_cpp.sh
+ script: install_cpp.sh # [unix]
requirements:
build:
- {{ compiler('c') }}
diff --git a/ipaacalib/cpp/CMakeLists.txt b/ipaacalib/cpp/CMakeLists.txt
index ec4cdbd..2832c9e 100644
--- a/ipaacalib/cpp/CMakeLists.txt
+++ b/ipaacalib/cpp/CMakeLists.txt
@@ -84,7 +84,7 @@ else()
# Setup section for Linux or OS X (using 'rsb' soa project)
#
#
- find_package(Boost COMPONENTS system filesystem thread regex signals REQUIRED)
+ find_package(Boost COMPONENTS system filesystem thread regex REQUIRED)
link_directories(${Boost_LIBRARY_DIRS})
include_directories(${Boost_INCLUDE_DIRS})
#set(BOOSTLIBS boost_regex-mt boost_date_time-mt boost_program_options-mt boost_thread-mt boost_filesystem-mt boost_signals-mt boost_system-mt)
--
GitLab