Linux compilation fix

Author: agruzdev

Source/Plugins/PluginRAS.cpp

@@ -22,6 +22,8 @@
 #include "FreeImage.h"
 #include "Utilities.h"
 
+#include <cstring>
+
 // ----------------------------------------------------------
 //   Constants + headers
 // ----------------------------------------------------------

Source/Plugins/PluginXBM.cpp

@@ -25,6 +25,8 @@
 #include "FreeImage.h"
 #include "Utilities.h"
 
+#include <cstring>
+
 // ==========================================================
 // Internal functions
 // ==========================================================

cmake/dependency.heif.cmake

@@ -11,10 +11,11 @@ include(${CMAKE_SOURCE_DIR}/cmake/dependency.kvazaar.cmake)
 include(${CMAKE_SOURCE_DIR}/cmake/dependency.dav1d.cmake)
 include(${CMAKE_SOURCE_DIR}/cmake/dependency.svtav1.cmake)
 
+set(HEIF_VERSION "1.20.2")
 
 ExternalProject_Add(HEIF
     PREFIX ${CMAKE_BINARY_DIR}/heif
-    URL "https://github.com/strukturag/libheif/releases/download/v1.20.2/libheif-1.20.2.tar.gz"
+    URL "https://github.com/strukturag/libheif/releases/download/v${HEIF_VERSION}/libheif-${HEIF_VERSION}.tar.gz"
     URL_MD5 "5d0442f7197a34b7aaf95bdffabb51e9"
     DOWNLOAD_DIR "${CMAKE_SOURCE_DIR}/dependencies/heif"
     SOURCE_DIR "${EXTERNALPROJECT_SOURCE_PREFIX}/dependencies/heif/source"
@@ -62,7 +63,7 @@ if (WIN32)
     set(LibHEIF_INSTALL_TYPE BIN)
     set(LibHEIF_INSTALL_NAME "heif.dll")
 else()
-    set(LibHEIF_INSTALL_LIBRARY ${CMAKE_BINARY_DIR}/heif/install/lib/libheif.so.1.19.7)
+    set(LibHEIF_INSTALL_LIBRARY ${CMAKE_BINARY_DIR}/heif/install/lib/libheif.so.${HEIF_VERSION})
     set(LibHEIF_INSTALL_TYPE LIB)
     set(LibHEIF_INSTALL_NAME "libheif.so")
 endif()

cmake/dependency.openjph.cmake

@@ -18,7 +18,7 @@ ExternalProject_Add(OPENJPH
     PATCH_COMMAND ""
     BUILD_COMMAND ${BUILD_COMMAND_FOR_TARGET} -t openjph
     CMAKE_ARGS ${CMAKE_BUILD_TYPE_ARG} "-DBUILD_SHARED_LIBS=OFF" "-DOJPH_BUILD_TESTS=OFF" "-DOJPH_ENABLE_TIFF_SUPPORT=OFF" "-DOJPH_BUILD_EXECUTABLES=OFF"
-        "-DCMAKE_C_FLAGS:STRING=${ZERO_WARNINGS_FLAG} -fPIC" "-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/openjph/install"
+        "-DCMAKE_C_FLAGS:STRING=${ZERO_WARNINGS_FLAG} -fPIC" "-DCMAKE_DEBUG_POSTFIX=d" "-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/openjph/install"
     EXCLUDE_FROM_ALL
 )
 
@@ -28,7 +28,11 @@ ExternalProject_Get_Property(OPENJPH INSTALL_DIR)
 
 add_library(LibOpenJPH INTERFACE)
 add_dependencies(LibOpenJPH OPENJPH)
-link_library_path2(LibOpenJPH ${INSTALL_DIR}/lib ${CMAKE_STATIC_LIBRARY_PREFIX}openjph.0.26${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}openjph.0.26d${CMAKE_STATIC_LIBRARY_SUFFIX})
+if (MSVC)
+    link_library_path2(LibOpenJPH ${INSTALL_DIR}/lib ${CMAKE_STATIC_LIBRARY_PREFIX}openjph.0.26${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}openjph.0.26d${CMAKE_STATIC_LIBRARY_SUFFIX})
+else()
+    target_link_libraries(LibOpenJPH INTERFACE ${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}openjph${CMAKE_STATIC_LIBRARY_SUFFIX})
+endif()
 target_include_directories(LibOpenJPH INTERFACE ${INSTALL_DIR}/include)
 set_property(TARGET OPENJPH PROPERTY FOLDER "Dependencies")