Unverified Commit 92bd905f authored Jun 30, 2020 by Kaitlyn Lee Committed by GitHub Jun 30, 2020

Updated meta.yml and environment.yml file for release. (#3938)

* Updated meta.yml and CMakeList.txt for 4.2 RC

* Removed nn label.

* Updated environment.yml file

parent 37e706a0

environment.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ dependencies:
		- nanoflann
		- nlohmann_json
		- ninja==1.7.2
		- conda-forge/label/gcc7::nn
		- nn
		- opencv>=3.0.0,<=4.0.0
		- openssl>=1.0.0,<1.1.0
		- pcl

recipe/meta.yaml

+2 −2

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ requirements:
		- nanoflann
		- nlohmann_json
		- ninja==1.7.2
		- conda-forge/label/gcc7::nn
		- nn
		- opencv>=3.0.0,<=4.0.0
		- openssl>=1.0.0,<1.1.0
		- pcl
		@@ -131,7 +131,7 @@ requirements:
		- mysql-connector-c
		- nanoflann
		- nlohmann_json
		- conda-forge/label/gcc7::nn
		- nn
		- opencv>=3.0.0,<=4.0.0
		- openssl>=1.0.0,<1.1.0
		- pcl