diff --git a/conda.recipe/build.sh b/conda.recipe/build.sh deleted file mode 100644 index 5f015ddd0f07d2d052c6bdaae510ca0a80aa4be4..0000000000000000000000000000000000000000 --- 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 549a6f59d9a59b98e01dea1a25858f472062ba0d..bcc969775c606d87a09757027a53cfab7fb3eb0a 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 85ffba77e682b9a9dc1c4b69cb908e193a09c4ee..62ad06bba1958517618b4d3d84e89a2b8567d5b5 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 ec4cdbdd522c7b42acade5d49a822a4aafc74a44..2832c9e018cf03c33298609d7bde24386085c689 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)