Skip to content
Snippets Groups Projects
Commit a58b61f9 authored by Jan Pöppel's avatar Jan Pöppel
Browse files

Merge branch 'softwareweek2019' into ryt-fullport

parents b58004e6 abf6e09e
No related branches found
No related tags found
No related merge requests found
# build protobuf files
echo 0
\ No newline at end of file
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
cd ipaaca-py cd ipaaca-py
echo "Installing ipaaca using setup.py" echo "Installing ipaaca using setup.py"
#python -m pip install . -vv #python -m pip install . -vv
python setup.py install --single-version-externally-managed --record=record.txt $PYTHON setup.py install --single-version-externally-managed --record=record.txt
\ No newline at end of file \ No newline at end of file
...@@ -13,7 +13,7 @@ source: ...@@ -13,7 +13,7 @@ source:
folder: ipaaca-py folder: ipaaca-py
build: build:
number: 1 number: 2
requirements: requirements:
...@@ -24,7 +24,7 @@ requirements: ...@@ -24,7 +24,7 @@ requirements:
outputs: outputs:
- name: ipaaca-cpp - name: ipaaca-cpp
script: install_cpp.sh script: install_cpp.sh # [unix]
requirements: requirements:
build: build:
- {{ compiler('c') }} - {{ compiler('c') }}
......
...@@ -84,7 +84,7 @@ else() ...@@ -84,7 +84,7 @@ else()
# Setup section for Linux or OS X (using 'rsb' soa project) # 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}) link_directories(${Boost_LIBRARY_DIRS})
include_directories(${Boost_INCLUDE_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) #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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment