From 6434eb2016bbc133145f6633c9152ddd9ee15865 Mon Sep 17 00:00:00 2001 From: Werner Palfinger Date: Fri, 10 Jan 2020 13:39:31 +0100 Subject: [PATCH 1/2] trying without CONAN_LIBTIFF_ROOT --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 651c075..62505e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,6 @@ conan_basic_setup(TARGETS) #hack for static opencv from conan center if(NOT CONAN_BIN_DIRS_OPENCV OR EXISTS "${CONAN_LIB_DIRS_OPENCV}/libopencv_core.a") set(OpenCV_STATIC ON) - set(CONAN_LIBTIFF_ROOT ${CONAN_TIFF_ROOT}) find_package(Eigen3 REQUIRED) find_package(protobuf REQUIRED) From 13cef550bc2adf405325aacb1f61aac365e887f1 Mon Sep 17 00:00:00 2001 From: Werner Palfinger Date: Fri, 10 Jan 2020 14:43:14 +0100 Subject: [PATCH 2/2] typo in license --- LICENSE | 1 - 1 file changed, 1 deletion(-) diff --git a/LICENSE b/LICENSE index 46cbe31..06ed288 100644 --- a/LICENSE +++ b/LICENSE @@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -e \ No newline at end of file