From ae3a70bd5a7e4e3cd16df43f6b0cc7ae1fd50860 Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Mon, 22 Jan 2018 16:06:06 +0100 Subject: [PATCH] Build improvements --- Makefile | 4 ++-- conda-recipe/meta.yaml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index aea05bc..3003f98 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,8 @@ BIN_DIR = ./bin MKDIR = mkdir -p CPP = g++ -CPPFLAGS = -Wall -std=c++1y -I./include -I${CONDA_PREFIX}/include -LDLIBS = -L${CONDA_PREFIX}/lib -lzmq -lhdf5 -lhdf5_hl -lhdf5_cpp -lhdf5_hl_cpp -lboost_system -lboost_regex -lboost_thread +CPPFLAGS = -Wall -pthread -std=c++1y -I./include -I${CONDA_PREFIX}/include +LDLIBS = -L/usr/lib64 -L${CONDA_PREFIX}/lib -lzmq -lhdf5 -lhdf5_hl -lhdf5_cpp -lhdf5_hl_cpp -lboost_system -lboost_regex -lboost_thread -lpthread LDFLAGS = -g HEADERS = $(wildcard $(SRC_DIR)/*.hpp) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 0b24091..0ce8c7d 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -12,14 +12,14 @@ requirements: build: - make - gcc - - cppzmq - - hdf5 - - boost + - cppzmq =4.2.1 + - hdf5 =1.8.17 + - boost =1.61.0 run: - - cppzmq - - hdf5 - - boost + - cppzmq =4.2.1 + - hdf5 =1.8.17 + - boost =1.61.0 about: