test1

Author: TheNicker

Codecs/CodecJPG/CMakeLists.txt

@@ -36,6 +36,8 @@ set(TurboJpegBinBaseDir "${CMAKE_BINARY_DIR}/libjpeg-turbo")
 
 # ======== CMake arguments for libjpeg-turbo ========
 set(LibJpegTurboArgs
+    -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+    -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
     -DENABLE_STATIC=FALSE
     -DWITH_FUZZ=FALSE
     -DWITH_JPEG=FALSE
@@ -47,48 +49,48 @@ 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 ${TurboJpegBinBaseDir}
-    CMAKE_ARGS ${LibJpegTurboArgs}
-    INSTALL_COMMAND ""
-    BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> --target turbojpeg
-)
+# Support Custom runtime and library output directories
+if (CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+    set(JPG_RUNTIME_OUTPUT_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+else()
+    set(JPG_RUNTIME_OUTPUT_DIR ${TurboJpegBinBaseDir})
+endif()
+
+
+if (CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+    set(JPG_LIB_OUTPUT_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+else()
+    set(JPG_LIB_OUTPUT_DIR ${TurboJpegBinBaseDir})
+endif()
 
 # ======== Declare Imported Library ========
 add_library(libjpeg-turbo::libjpeg-turbo SHARED IMPORTED GLOBAL)
+set(JPG_IMPORTED_LOCATION "")
+set(JPG_IMPORTED_IMPLIB "")
+
 
 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}/${JPG_RUNTIME_NAME}"
-        )
 
+        set_target_properties(libjpeg-turbo::libjpeg-turbo PROPERTIES 
+        "IMPORTED_LOCATION_${cfg_upper}" "${JPG_RUNTIME_OUTPUT_DIR}/${cfg}/${JPG_RUNTIME_NAME}")
         # Set import library on Windows
         if(WIN32)
-            set_target_properties(libjpeg-turbo::libjpeg-turbo PROPERTIES
-                "IMPORTED_IMPLIB_${cfg_upper}" "${cfg_bin_dir}/${JPG_IMPLIB_NAME}"
-            )
+            set_target_properties(libjpeg-turbo::libjpeg-turbo PROPERTIES 
+            "IMPORTED_IMPLIB_${cfg_upper}" "${JPG_LIB_OUTPUT_DIR}/${cfg}/${JPG_IMPLIB_NAME}")
         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}/${JPG_RUNTIME_NAME}"
-    )
+    set_target_properties(libjpeg-turbo::libjpeg-turbo PROPERTIES IMPORTED_LOCATION 
+    "${JPG_RUNTIME_OUTPUT_DIR}/${JPG_RUNTIME_NAME}")
 
     # Set import library on Windows
     if(WIN32)
-        set_target_properties(libjpeg-turbo::libjpeg-turbo PROPERTIES
-            IMPORTED_IMPLIB "${cfg_bin_dir}/${JPG_IMPLIB_NAME}"
-        )
+        set_target_properties(libjpeg-turbo::libjpeg-turbo PROPERTIES IMPORTED_IMPLIB
+         "${JPG_LIB_OUTPUT_DIR}/${JPG_IMPLIB_NAME}")
     endif()
 endif()
 
@@ -97,12 +99,21 @@ set_target_properties(libjpeg-turbo::libjpeg-turbo PROPERTIES
     INTERFACE_INCLUDE_DIRECTORIES "${LibJpegTurboFolder}/src"
 )
 
+# ======== Add ExternalProject ========
+ExternalProject_Add(libjpeg-turbo
+    SOURCE_DIR ${LibJpegTurboFolder}
+    BINARY_DIR ${TurboJpegBinBaseDir}
+    CMAKE_ARGS ${LibJpegTurboArgs}
+    INSTALL_COMMAND ""
+    BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> --target turbojpeg
+    BYPRODUCTS ${JPG_IMPORTED_LOCATION} 
+        $<$<PLATFORM_ID:Windows>:${JPG_IMPORTED_IMPLIB}>
+)
+
 # ======== Depend on ExternalProject ========
 add_dependencies(libjpeg-turbo::libjpeg-turbo libjpeg-turbo)
 
 
-
-# =========================
 # =========================
 
  file(GLOB_RECURSE sourceFiles
@@ -115,28 +126,6 @@ add_library (${TargetName} ${sourceFiles} )
 
 target_link_libraries(${TargetName} PRIVATE libjpeg-turbo::libjpeg-turbo)  # adjust to match built target name
 
-# ======== Copy runtime to ${CMAKE_CURRENT_BINARY_DIR} ========
-if(IS_MULTI_CONFIG)
-    # Copy all configs' DLLs/SOs/DYLIBs
-    foreach(cfg ${CMAKE_CONFIGURATION_TYPES})
-    add_custom_command(TARGET ${TargetName} POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "$<TARGET_FILE:libjpeg-turbo::libjpeg-turbo>"
-        "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>/")
-        
-    endforeach()
-else()
-
-add_custom_command(TARGET ${TargetName} POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "$<TARGET_FILE:libjpeg-turbo::libjpeg-turbo>"
-        "${CMAKE_CURRENT_BINARY_DIR}/")
-endif()
-
- 
-target_include_directories(${TargetName} PRIVATE ${LibJpegTurboFolder}/src) 
-
 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()