Fix: ImagecCodec example

Author: TheNicker

Codecs/CodecJPG/CMakeLists.txt

@@ -3,11 +3,12 @@ cmake_minimum_required(VERSION 3.10)
 
 include(ExternalProject)
 
-set(LibJpegTurboFolder ../../External/libjpeg-turbo)
+set(LibJpegTurboFolder ${CMAKE_CURRENT_SOURCE_DIR}/../../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(TurboJpegBinDir ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libjpeg-turbo)
+get_filename_component(TurboJpegBinDir "${TurboJpegBinDir}" ABSOLUTE)
 
 set(LibJpegTurboArgs
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
@@ -22,15 +23,37 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND NOT ${CMAKE_HOST_SYSTEM_NAME} STR
     list(APPEND LibJpegTurboArgs -DCMAKE_ASM_NASM_COMPILER=${NASMPATH})
 endif()
 
+if(WIN32)
+    set(TURBOJPEG_RUNTIME "${TurboJpegBinDir}/turbojpeg.dll")
+    set(TURBOJPEG_IMPLIB  "${TurboJpegBinDir}/turbojpeg.lib")
+elseif(APPLE)
+    set(TURBOJPEG_RUNTIME "${TurboJpegBinDir}/turbojpeg.dylib")
+else()
+    set(TURBOJPEG_RUNTIME "${TurboJpegBinDir}/turbojpeg.so")
+endif()
+
+
 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
+    BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG> --target turbojpeg
+    BUILD_BYPRODUCTS ${TURBOJPEG_RUNTIME}
 )
 
+add_library(libjpeg-turbo::libjpeg-turbo SHARED IMPORTED GLOBAL)
+
+
+set_target_properties(libjpeg-turbo::libjpeg-turbo PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${LibJpegTurboFolder}/src"
+    IMPORTED_LOCATION "${TURBOJPEG_RUNTIME}"
+    IMPORTED_IMPLIB   "${TURBOJPEG_IMPLIB}" # Will be empty on non-Windows
+)
+
+
+add_dependencies(libjpeg-turbo::libjpeg-turbo libjpeg-turbo)
+
  file(GLOB_RECURSE sourceFiles
      "./Source/*.h"
      "./Source/*.cpp"
@@ -39,14 +62,14 @@ ExternalProject_Add(libjpeg-turbo
 set(TargetName CodecJPG)
 add_library (${TargetName} ${sourceFiles} )
 
-add_dependencies(${TargetName} libjpeg-turbo)
-target_link_libraries(${TargetName} PRIVATE ${TurboJpegBinDir}/turbojpeg.lib)  # adjust to match built target name
+target_link_libraries(${TargetName} PRIVATE libjpeg-turbo::libjpeg-turbo)  # adjust to match built target name
+
+add_custom_command(TARGET ${TargetName} POST_BUILD
+          COMMAND ${CMAKE_COMMAND} -E copy_if_different ${TURBOJPEG_RUNTIME} ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/)
 
-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_include_directories(${TargetName} PRIVATE ${LibJpegTurboFolder}/src)
 
-if (${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND  NOT MINGW)
+if (${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC") AND NOT MINGW)
     target_link_options(${TargetName} PUBLIC "/DELAYLOAD:turbojpeg.dll")
 else()
 endif()

Codecs/CodecTiff/CMakeLists.txt

@@ -68,6 +68,6 @@ target_include_directories(${TargetName} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/ext
 
 
 target_link_libraries(${TargetName} tiff)
-if (${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND NOT MINGW)
+if (${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC") AND NOT MINGW)
    target_link_options(${TargetName} PUBLIC "/DELAYLOAD:$<TARGET_FILE_BASE_NAME:tiff>.dll")
 endif()

Example/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.8)
+cmake_minimum_required (VERSION 3.10)
 
 #Image Codec
 set(CMAKE_CXX_STANDARD 20)
@@ -16,21 +16,26 @@ add_executable(${TargetName} ${sourceFiles})
 target_include_directories(${TargetName} PRIVATE ./Imageloader/Include)
 target_link_libraries(${TargetName} PRIVATE ImageCodec)
 
+
 if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-    target_link_libraries(${TargetName} PRIVATE delayimp)
+    target_link_libraries(${TargetName} PRIVATE delayimp dbghelp)
 endif()
 
 
+set(OUTPUT_PATH $<TARGET_FILE_DIR:${TargetName}>)
+
 #Copy oiv library resources to the output dir 
-     add_custom_command(TARGET ${TargetName}
-     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cat.jpg ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/)
-
-#Copy needed dependencies to output dir 
-    add_custom_command(TARGET ${TargetName} POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:png_shared> ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/)
-
-    add_custom_command(TARGET ${TargetName} POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:zlib> ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/)
-    
-    add_custom_command(TARGET ${TargetName} POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:turbojpeg> ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/)
+add_custom_command(TARGET ${TargetName} POST_BUILD
+COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cat.jpg  ${OUTPUT_PATH}/)
+
+#copy zlib, libpng and libjpeg-turbo dlls to the output dir
+add_custom_command(TARGET ${TargetName} POST_BUILD
+COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:zlib> ${OUTPUT_PATH}/)
+
+add_custom_command(TARGET ${TargetName} POST_BUILD
+COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:png_shared> ${OUTPUT_PATH}/)
+
+add_custom_command(TARGET ${TargetName} POST_BUILD
+COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:libjpeg-turbo::libjpeg-turbo> ${OUTPUT_PATH}/)
+
+