From cf90393c36172c6690d424d239972c36408df6bd Mon Sep 17 00:00:00 2001 From: LAVAUX Guilhem Date: Mon, 10 Feb 2020 08:40:17 +0100 Subject: [PATCH] Portability fixes --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- src/loadRamses.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e21c7d..2690baf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,7 @@ IF(YORICK_SUPPORT) ENDIF(YORICK_SUPPORT) find_program(CYTHON cython3 cython) -find_library(ZLIB z) +find_library(ZLIB_LIBRARY z) find_library(DL_LIBRARY dl) find_library(MATH_LIBRARY m) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 196ed36..a4c81e8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -79,7 +79,7 @@ if(YORICK_SUPPORT) endif(YORICK_SUPPORT) if (HDF5_FOUND) - set(CosmoTool_LIBS ${CosmoTool_LIBS} ${HDF5_CXX_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB}) + set(CosmoTool_LIBS ${CosmoTool_LIBS} ${HDF5_CXX_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARY}) message(STATUS "CosmoTool_LIBS: ${CosmoTool_LIBS}") endif (HDF5_FOUND) diff --git a/src/loadRamses.cpp b/src/loadRamses.cpp index 0c628f8..3e841d5 100644 --- a/src/loadRamses.cpp +++ b/src/loadRamses.cpp @@ -34,7 +34,7 @@ knowledge of the CeCILL license and that you accept its terms. +*/ #include -#include "/usr/include/regex.h" +#include #include #include #include