Commit dee83e97 authored by Baptiste Esteban's avatar Baptiste Esteban
Browse files

Apply merge request comments

parent b4604305
Pipeline #30398 passed with stage
in 22 minutes and 31 seconds
......@@ -23,7 +23,7 @@ class Pylene(ConanFile):
exports_sources = ["pylene/*", "pylene-python/*", "cmake/*", "CMakeLists.txt", "LICENSE"]
build_requires = [
"gtest/1.10.0",
"gtest/[>=1.10.0]",
"benchmark/[>=1.5.0]",
]
......
......@@ -7,7 +7,7 @@ find_package(TBB REQUIRED tbb)
find_package(range-v3 0.10.0 REQUIRED)
find_package(fmt 6.0 REQUIRED)
find_package(xsimd REQUIRED)
find_package(cfitsio REQUIRED)
find_package(cfitsio)
set(PYLENE_USE_TBB YES CACHE BOOL "Set to NO to disable use of TBB and parallelization")
......@@ -96,25 +96,27 @@ target_sources(Pylene-io-freeimage PRIVATE
src/io/imread.cpp
src/io/io.cpp
)
target_compile_features(Pylene-io-freeimage PUBLIC cxx_std_20)
target_include_directories(Pylene-io-freeimage PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>
)
target_link_libraries(Pylene-io-freeimage PUBLIC FreeImage::FreeImage Pylene-core)
target_link_libraries(Pylene-io-freeimage PUBLIC Pylene-core)
target_link_libraries(Pylene-io-freeimage PRIVATE FreeImage::FreeImage)
add_library(Pylene-io-fits)
add_library(Pylene::IO-fits ALIAS Pylene-io-fits)
target_sources(Pylene-io-fits PRIVATE
if (cfitsio_FOUND)
add_library(Pylene-io-fits)
add_library(Pylene::IO-fits ALIAS Pylene-io-fits)
target_sources(Pylene-io-fits PRIVATE
src/io/cfitsio_plugin.cpp
src/io/io.cpp
)
target_compile_features(Pylene-io-fits PUBLIC cxx_std_20)
target_include_directories(Pylene-io-fits PUBLIC
)
target_include_directories(Pylene-io-fits PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>
)
target_link_libraries(Pylene-io-fits PUBLIC cfitsio::cfitsio Pylene-core)
)
target_link_libraries(Pylene-io-fits PUBLIC Pylene-core)
target_link_libraries(Pylene-io-fits PRIVATE cfitsio::cfitsio)
endif(cfitsio_FOUND)
# Compiler configurations
target_compile_features(Pylene-core PUBLIC cxx_std_20)
......
#pragma once
#include <mln/core/image/ndimage_fwd.hpp>
#include <string>
namespace mln::io::fits
{
mln::ndbuffer_image imread(const std::string& filename, int ind=0);
void imread(const std::string& filename, mln::ndbuffer_image& out, int ind=0);
}
\ No newline at end of file
......@@ -9,9 +9,4 @@ namespace mln::io
mln::ndbuffer_image imread(const std::string& filename);
void imread(const std::string& filename, mln::ndbuffer_image& out);
namespace fits
{
mln::ndbuffer_image imread(const std::string& filename, int ind=0);
void imread(const std::string& filename, mln::ndbuffer_image& out, int ind=0);
} // namespace fits
} // namespace mln::io
#include <mln/core/image/ndimage.hpp>
#include <mln/io/imread.hpp>
#include <mln/io/fits/imread.hpp>
#include <mln/io/private/cfitsio_plugin.hpp>
#include <mln/io/private/io.hpp>
......
find_package(cfitsio)
add_core_test(UTIo_freeimage freeimage.cpp)
add_core_test(UTIo_imprint imprint.cpp)
add_core_test(UTIo_cfitsio cfitsio.cpp)
target_link_libraries(UTIo_cfitsio PUBLIC Pylene::IO-fits)
\ No newline at end of file
if (cfitsio_FOUND)
add_core_test(UTIo_cfitsio cfitsio.cpp)
target_link_libraries(UTIo_cfitsio PUBLIC Pylene::IO-fits)
endif(cfitsio_FOUND)
\ No newline at end of file
#include <mln/core/image/ndimage.hpp>
#include <mln/io/imread.hpp>
#include <mln/io/fits/imread.hpp>
#include <fixtures/ImageCompare/image_compare.hpp>
#include <fixtures/ImagePath/image_path.hpp>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment