Fixed: CMake warnings

Author: TheNicker

.gitmodules

@@ -18,10 +18,10 @@
 	url = https://github.com/OpenImageViewer/libgif.git
 [submodule "External/libtiff"]
 	path = External/libtiff
-	url = https://github.com/OpenImageViewer/libtiff.git
+	url = https://gitlab.com/libtiff/libtiff.git
 [submodule "External/libjpeg-turbo"]
 	path = External/libjpeg-turbo
-	url = https://github.com/OpenImageViewer/libjpeg-turbo.git
+	url = https://github.com/libjpeg-turbo/libjpeg-turbo.git
 [submodule "External/bintools"]
 	path = External/bintools
 	url = https://github.com/OpenImageViewer/bintools.git

Codecs/CodecJPG/CMakeLists.txt

@@ -1,38 +1,52 @@
 #Codec JPG
 cmake_minimum_required(VERSION 3.10)
 
-file(GLOB_RECURSE sourceFiles
-    "./Source/*.h"
-    "./Source/*.cpp"
+include(ExternalProject)
+
+set(LibJpegTurboFolder ../../External/libjpeg-turbo)
+get_filename_component(LibJpegTurboFolder "${LibJpegTurboFolder}" ABSOLUTE)
+set(NASMPATH ${CMAKE_CURRENT_SOURCE_DIR}/../../External/bintools/nasm-2.15.05/nasm.exe)
+get_filename_component(NASMPATH "${NASMPATH}" ABSOLUTE)
+set(TurboJpegBinDir ${CMAKE_BINARY_DIR}/libjpeg-turbo)
+
+set(LibJpegTurboArgs
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        -DENABLE_STATIC=FALSE
+        -DWITH_FUZZ=FALSE
+        -DCMAKE_INSTALL_PREFIX=${TurboJpegBinDir}/install
+        -DWITH_JPEG=FALSE # Disable JPEG codec, we only need TurboJPEG
 )
 
-set(TargetName CodecJPG)
-add_library (${TargetName} ${sourceFiles} )
-
-
-set(libjpeg-turboFolder ../../External/libjpeg-turbo)
 #Enable ASM provided by NASM
-
 if (${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND NOT ${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux")
-    set(CMAKE_ASM_NASM_COMPILER ${CMAKE_CURRENT_SOURCE_DIR}/../../External/bintools/nasm-2.15.05/nasm.exe)
+    list(APPEND LibJpegTurboArgs -DCMAKE_ASM_NASM_COMPILER=${NASMPATH})
 endif()
-#set(ENV{ASM_NASM} ${CMAKE_CURRENT_SOURCE_DIR}/../../External/bintools/nasm-2.15.05/nasm.exe)
-
-#set(CMAKE_ASM_COMPILE_OBJECT "-I<CMAKE_CURRENT_SOURCE_DIR>/../../External/libjpeg-turbo/simd/nasm 
-# -I<CMAKE_CURRENT_SOURCE_DIR>/../../External/libjpeg-turbo/simd/x86_64 <SOURCE>")
-
 
+ExternalProject_Add(libjpeg-turbo
+    SOURCE_DIR ${LibJpegTurboFolder} 
+    BINARY_DIR ${TurboJpegBinDir}
+    CMAKE_ARGS ${LibJpegTurboArgs}
+    INSTALL_COMMAND ""  # <--- disables 'ninja install'
+    BUILD_COMMAND ${CMAKE_COMMAND} --build . --target turbojpeg
+    BUILD_BYPRODUCTS ${TurboJpegBinDir}/turbojpeg.dll
+)
 
-option(ENABLE_STATIC "Build static libraries" FALSE)
-set(WITH_FUZZ FALSE)
+ file(GLOB_RECURSE sourceFiles
+     "./Source/*.h"
+     "./Source/*.cpp"
+ )
 
+set(TargetName CodecJPG)
+add_library (${TargetName} ${sourceFiles} )
 
-add_subdirectory(${libjpeg-turboFolder} ./external/libjpeg-turbo)
+add_dependencies(${TargetName} libjpeg-turbo)
+target_link_libraries(${TargetName} PRIVATE ${TurboJpegBinDir}/turbojpeg.lib)  # adjust to match built target name
 
-target_include_directories(${TargetName} PRIVATE ${libjpeg-turboFolder})
+add_custom_command(TARGET libjpeg-turbo POST_BUILD
+          COMMAND ${CMAKE_COMMAND} -E copy_if_different ${TurboJpegBinDir}/turbojpeg.dll ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/)
+target_include_directories(${TargetName} PRIVATE ${LibJpegTurboFolder}/src)
 
-target_link_libraries(${TargetName} turbojpeg)
 if (${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND  NOT MINGW)
-    target_link_options(${TargetName} PUBLIC "/DELAYLOAD:$<TARGET_FILE_BASE_NAME:turbojpeg>.dll")
+    target_link_options(${TargetName} PUBLIC "/DELAYLOAD:turbojpeg.dll")
 else()
 endif()

Codecs/CodecPNG/CMakeLists.txt

@@ -32,14 +32,18 @@ add_subdirectory(${zlibFolder} ./external/zlib)
 
 list(APPEND ZLIB_INCLUDE_DIRS "${zlibFolder}")
 list(APPEND ZLIB_INCLUDE_DIRS "${CMAKE_CURRENT_BINARY_DIR}/external/zlib")
+set(ZLIB_INCLUDE_DIR ${zlibFolder})
 set(ZLIB_LIBRARIES zlib)
+set(ZLIB_FOUND TRUE)
+set(ZLIB_ROOT, ${zlibFolder})
+set(ZLIB_LIBRARY ${zlibFolder})
+
 
 #LibPNG
 option(PNG_SHARED       "Build shared lib" ON)
 option(PNG_STATIC       "Build static lib" OFF)
 option(PNG_TESTS        "Build libpng tests" OFF)
-option(PNG_EXECUTABLES  "Build libpng executables" OFF)
-option(PNG_BUILD_ZLIB   "Custom zlib Location, else find_package is used" ON)
+option(PNG_TOOLS        "Build libpng tools" OFF)
 
 
 set(SKIP_INSTALL_LIBRARIES TRUE)

Codecs/CodecTiff/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.10)
 
 # Add source to this project's executable.
 file(GLOB_RECURSE sourceFiles
@@ -8,7 +8,14 @@ file(GLOB_RECURSE sourceFiles
 
 set(TargetName CodecTiff)
 add_library (${TargetName} ${sourceFiles} )
-set(TIFF_BUILD_SHARED_LIBS TRUE)
+
+option(tiff-static "build TIFF static libraries" OFF)
+option(tiff-tools "build TIFF tools" OFF)
+option(tiff-tests "build TIFF tests" OFF)
+option(tiff-contrib "build TIFF contrib" OFF)
+option(tiff-docs "build TIFF documentation" OFF)
+option(tiff-deprecated "build TIFF deprecated features" OFF)
+
 set(TIFF_BUILD_CXX FALSE)
 set(LibTiffFolder ../../External/libtiff)
 add_subdirectory(${LibTiffFolder} ./external/libtiff)
@@ -47,14 +54,6 @@ if (IMCODEC_DISABLE_WARNINGS_EXTERNAL_LIBS)
             -Wno-switch-default
             )
 
-            target_compile_options(port PRIVATE 
-            -Wno-missing-prototypes
-            -Wno-strict-prototypes
-            -Wno-reserved-macro-identifier
-            -Wno-reserved-identifier
-            -Wno-missing-variable-declarations
-            -Wno-unsafe-buffer-usage
-            )
     elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
         target_compile_options(tiff PRIVATE -Wno-array-parameter -Wno-misleading-indentation)
     elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")

Codecs/CodecWebP/CMakeLists.txt

@@ -1,5 +1,5 @@
 #Codec WebP
-cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.10)
 
 # Add source to this project's executable.
 file(GLOB_RECURSE sourceFiles