Skip to content

Commit 9605f7b

Browse files
committed
latest conda builds using Ubuntu 18.04 VM
NO_EPICS=1 conda build conda-recipe --output-folder bld-dir -c tidair-tag -c conda-forge
1 parent 35df469 commit 9605f7b

File tree

13 files changed

+38
-29
lines changed

13 files changed

+38
-29
lines changed

CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,10 @@ if (NOT ZeroMQ_FOUND)
162162

163163
endif()
164164

165-
166165
#####################################
167166
# EPICS V3
168167
#####################################
169-
if((NOT NO_PYTHON) AND (NOT NO_EPICS) AND DEFINED ENV{EPICS_BASE})
168+
if((NOT NO_PYTHON) AND (DO_EPICS) AND DEFINED ENV{EPICS_BASE})
170169
set(DO_EPICS_V3 1)
171170
set(EPICS_BASE_DIR $ENV{EPICS_BASE})
172171
if(DEFINED ENV{EPICS_HOST_ARCH})
@@ -218,7 +217,6 @@ else()
218217
set(DO_EPICS_V3 0)
219218
endif()
220219

221-
222220
##########################################################
223221
# Generate version with GIT If Not Passed As -DVERSION
224222
##########################################################

conda-recipe/conda_build_config.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@
22
CONDA_BUILD_SYSROOT:
33
- /opt/MacOSX10.15.sdk # [osx]
44

5+
c_compiler_version: 11
6+
cxx_compiler_version: 11
7+

conda-recipe/meta.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ build:
1010

1111
requirements:
1212
build:
13-
- python<3.8
13+
- python >=3.6,<3.10
14+
- setuptools
1415
- boost
1516
- {{ compiler('c') }}
1617
- {{ compiler('cxx') }}
@@ -20,24 +21,21 @@ requirements:
2021
- bzip2
2122
- zeromq
2223
- epics-base
23-
- pcas
2424
- numpy
2525
host:
26-
- python<3.8
26+
- python >=3.6,<3.10
2727
- boost
2828
- bzip2
2929
- zeromq
3030
- epics-base
31-
- pcas
3231
- numpy
3332
run:
34-
- python<3.8
33+
- python >=3.6,<3.10
3534
- {{ pin_compatible('boost', min_pin='x.x', max_pin='x.x')}}
3635
- boost
3736
- bzip2
3837
- zeromq
3938
- epics-base
40-
- pcas
4139
- numpy
4240
- ipython
4341
- p4p

include/rogue/Logging.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include <mutex>
2626
#include <vector>
2727
#include <string>
28+
#include <memory>
2829

2930
namespace rogue {
3031

include/rogue/interfaces/memory/TransactionLock.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#define __ROGUE_INTERFACES_MEMORY_TRANSACTION_LOCK_H__
2222
#include <stdint.h>
2323
#include <thread>
24+
#include <memory>
2425

2526
namespace rogue {
2627
namespace interfaces {

include/rogue/interfaces/stream/FrameLock.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#define __ROGUE_INTERFACES_MEMORY_FRAME_LOCK_H__
2222
#include <stdint.h>
2323
#include <thread>
24+
#include <memory>
2425

2526
namespace rogue {
2627
namespace interfaces {

include/rogue/interfaces/stream/Master.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <thread>
2828
#include <mutex>
2929
#include <rogue/EnableSharedFromThis.h>
30+
#include <memory>
3031

3132
#ifndef NO_PYTHON
3233
#define BOOST_BIND_GLOBAL_PLACEHOLDERS

include/rogue/interfaces/stream/Slave.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <rogue/interfaces/stream/Pool.h>
2727
#include <rogue/Logging.h>
2828
#include <rogue/EnableSharedFromThis.h>
29+
#include <memory>
2930

3031
#ifndef NO_PYTHON
3132
#define BOOST_BIND_GLOBAL_PLACEHOLDERS

include/rogue/protocols/packetizer/Core.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#define __ROGUE_PROTOCOLS_PACKETIZER_CORE_H__
1919
#include <thread>
2020
#include <stdint.h>
21+
#include <memory>
2122

2223
namespace rogue {
2324
namespace protocols {

include/rogue/protocols/packetizer/CoreV2.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#define __ROGUE_PROTOCOLS_PACKETIZER_CORE_V2_H__
2222
#include <thread>
2323
#include <stdint.h>
24+
#include <memory>
2425

2526
namespace rogue {
2627
namespace protocols {

0 commit comments

Comments
 (0)