diff --git a/CHANGELOG.md b/CHANGELOG.md index aae72971..83762ab9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [0.1.1] - 2021-03-22 + - Do not use find_dependency in matioCppConfig.cmake if OVERRIDE_MODULE_PATH is used: [#41](https://github.com/dic-iit/matio-cpp/pull/41). - Make sure to add a NULL terminator in the cases where the new matio version uses strlen: [#44](https://github.com/dic-iit/matio-cpp/pull/44). - Allow the assignment from string also for non standard strings: [#45](https://github.com/dic-iit/matio-cpp/pull/45). diff --git a/CMakeLists.txt b/CMakeLists.txt index 9726530d..ce5500e1 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ # BSD-2-Clause license (https://opensource.org/licenses/BSD-2-Clause). cmake_minimum_required(VERSION 3.10) -project(matioCpp VERSION 0.1.0 LANGUAGES CXX) +project(matioCpp VERSION 0.1.1 LANGUAGES CXX) # Defines the CMAKE_INSTALL_LIBDIR, CMAKE_INSTALL_BINDIR and many other useful macros. # See https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html diff --git a/cmake/FindMATIO.cmake b/cmake/FindMATIO.cmake index 6f7788a6..1e4f8e41 100644 --- a/cmake/FindMATIO.cmake +++ b/cmake/FindMATIO.cmake @@ -14,8 +14,9 @@ include(FindPackageHandleStandardArgs) -set(MATIO_ROOT_DIR "" CACHE PATH "Folder contains MatIO") -find_path(MATIO_INCLUDE_DIR matio.h PATHS ${MATIO_ROOT_DIR}) +set(MATIO_ROOT_DIR "$ENV{MATIO_DIR}" CACHE PATH "Folder contains MatIO") + +find_path(MATIO_INCLUDE_DIR matio.h PATHS ${MATIO_ROOT_DIR} PATH_SUFFIXES include) mark_as_advanced(MATIO_INCLUDE_DIR) find_library(MATIO_LIBRARY matio libmatio PATHS ${MATIO_ROOT_DIR} PATH_SUFFIXES lib) mark_as_advanced(MATIO_LIBRARY)