test

Author: TheNicker

Codecs/CodecJPG/CMakeLists.txt

@@ -9,93 +9,101 @@ set(NASMPATH ${CMAKE_CURRENT_SOURCE_DIR}/../../External/bintools/nasm-2.15.05/na
 get_filename_component(NASMPATH "${NASMPATH}" ABSOLUTE)
 
 
-if(CMAKE_GENERATOR STREQUAL "Ninja")
-set(TurboJpegBinDir ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libjpeg-turbo)
-get_filename_component(TurboJpegBinDir "${TurboJpegBinDir}" ABSOLUTE)
-
-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
-)
+# =========================
+# =========================
 
-#Enable ASM provided by NASM
-if (${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND NOT ${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux")
-    list(APPEND LibJpegTurboArgs -DCMAKE_ASM_NASM_COMPILER=${NASMPATH})
+# ======== Detect Multi-config vs Single-config ========
+if(CMAKE_CONFIGURATION_TYPES)
+    set(IS_MULTI_CONFIG TRUE)
+else()
+    set(IS_MULTI_CONFIG FALSE)
 endif()
 
+# ======== Platform-specific file extensions ========
 if(WIN32)
-    set(TURBOJPEG_RUNTIME "${TurboJpegBinDir}/turbojpeg.dll")
-    set(TURBOJPEG_IMPLIB  "${TurboJpegBinDir}/turbojpeg.lib")
+    set(LIB_EXT ".dll")
+    set(IMPLIB_EXT ".lib")
 elseif(APPLE)
-    set(TURBOJPEG_RUNTIME "${TurboJpegBinDir}/turbojpeg.dylib")
+    set(LIB_EXT ".dylib")
+    set(IMPLIB_EXT "") # No import libs on macOS
 else()
-    set(TURBOJPEG_RUNTIME "${TurboJpegBinDir}/turbojpeg.so")
+    set(LIB_EXT ".so")
+    set(IMPLIB_EXT "") # No import libs on Linux
 endif()
 
+# ======== External build directory ========
+set(TurboJpegBinBaseDir "${CMAKE_BINARY_DIR}/libjpeg-turbo")
 
-ExternalProject_Add(libjpeg-turbo
-    SOURCE_DIR ${LibJpegTurboFolder} 
-    BINARY_DIR ${TurboJpegBinDir}
-    CMAKE_ARGS ${LibJpegTurboArgs}
-    INSTALL_COMMAND ""  # <--- disables 'ninja install'
-    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
-)
-else()
-# MSVC / Xcode (multi-config)
-set(TurboJpegBinDir_DEBUG   ${CMAKE_BINARY_DIR}/libjpeg-turbo/Debug)
-get_filename_component(TurboJpegBinDir_DEBUG "${TurboJpegBinDir_DEBUG}" ABSOLUTE)
-set(TurboJpegBinDir_RELEASE ${CMAKE_BINARY_DIR}/libjpeg-turbo/Release)
-get_filename_component(TurboJpegBinDir_RELEASE "${TurboJpegBinDir_RELEASE}" ABSOLUTE)
-
+# ======== CMake arguments for libjpeg-turbo ========
 set(LibJpegTurboArgs
     -DENABLE_STATIC=FALSE
     -DWITH_FUZZ=FALSE
-    -DWITH_JPEG=FALSE # Disable JPEG codec, we only need TurboJPEG
-    -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/libjpeg-turbo/install
+    -DWITH_JPEG=FALSE
+    -DCMAKE_INSTALL_PREFIX=${TurboJpegBinBaseDir}/install
 )
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND NOT ${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux")
+# Enable NASM on Windows if needed
+if(WIN32 AND NOT ${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux")
     list(APPEND LibJpegTurboArgs -DCMAKE_ASM_NASM_COMPILER=${NASMPATH})
 endif()
 
+# ======== Add ExternalProject ========
 ExternalProject_Add(libjpeg-turbo
     SOURCE_DIR ${LibJpegTurboFolder}
-    BINARY_DIR ${CMAKE_BINARY_DIR}/libjpeg-turbo
+    BINARY_DIR ${TurboJpegBinBaseDir}
     CMAKE_ARGS ${LibJpegTurboArgs}
     INSTALL_COMMAND ""
-    BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config ${CMAKE_CFG_INTDIR} --target turbojpeg
-    BUILD_BYPRODUCTS
-        ${TurboJpegBinDir_DEBUG}/turbojpeg.dll
-        ${TurboJpegBinDir_RELEASE}/turbojpeg.dll
+    BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> --target turbojpeg
 )
 
+# ======== Declare Imported Library ========
 add_library(libjpeg-turbo::libjpeg-turbo SHARED IMPORTED GLOBAL)
 
+if(IS_MULTI_CONFIG)
+    # Multi-config: set per-config imported locations
+    foreach(cfg ${CMAKE_CONFIGURATION_TYPES})
+        string(TOUPPER "${cfg}" cfg_upper)
+        set(cfg_bin_dir "${TurboJpegBinBaseDir}/${cfg}")
+
+        # Set runtime library
+        set_target_properties(libjpeg-turbo::libjpeg-turbo PROPERTIES
+            "IMPORTED_LOCATION_${cfg_upper}" "${cfg_bin_dir}/turbojpeg${LIB_EXT}"
+        )
+
+        # Set import library on Windows
+        if(WIN32)
+            set_target_properties(libjpeg-turbo::libjpeg-turbo PROPERTIES
+                "IMPORTED_IMPLIB_${cfg_upper}" "${cfg_bin_dir}/turbojpeg${IMPLIB_EXT}"
+            )
+        endif()
+    endforeach()
+else()
+    # Single-config: flat directory
+    set(cfg_bin_dir "${TurboJpegBinBaseDir}")
+    set_target_properties(libjpeg-turbo::libjpeg-turbo PROPERTIES
+        IMPORTED_LOCATION "${cfg_bin_dir}/turbojpeg${LIB_EXT}"
+    )
+
+    # Set import library on Windows
+    if(WIN32)
+        set_target_properties(libjpeg-turbo::libjpeg-turbo PROPERTIES
+            IMPORTED_IMPLIB "${cfg_bin_dir}/turbojpeg${IMPLIB_EXT}"
+        )
+    endif()
+endif()
+
+# ======== Include directories ========
 set_target_properties(libjpeg-turbo::libjpeg-turbo PROPERTIES
     INTERFACE_INCLUDE_DIRECTORIES "${LibJpegTurboFolder}/src"
-    IMPORTED_LOCATION_DEBUG   "${TurboJpegBinDir_DEBUG}/turbojpeg.dll"
-    IMPORTED_LOCATION_RELEASE "${TurboJpegBinDir_RELEASE}/turbojpeg.dll"
-    IMPORTED_IMPLIB_DEBUG     "${TurboJpegBinDir_DEBUG}/turbojpeg.lib"
-    IMPORTED_IMPLIB_RELEASE   "${TurboJpegBinDir_RELEASE}/turbojpeg.lib"
 )
 
-endif()
+# ======== Depend on ExternalProject ========
+add_dependencies(libjpeg-turbo::libjpeg-turbo libjpeg-turbo)
 
 
-add_dependencies(libjpeg-turbo::libjpeg-turbo libjpeg-turbo)
+
+# =========================
+# =========================
 
  file(GLOB_RECURSE sourceFiles
      "./Source/*.h"