Skip to content

Commit 0c17718

Browse files
committed
test2
1 parent a264c77 commit 0c17718

1 file changed

Lines changed: 10 additions & 6 deletions

File tree

Codecs/CodecJPG/CMakeLists.txt

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,20 +115,24 @@ add_library (${TargetName} ${sourceFiles} )
115115

116116
target_link_libraries(${TargetName} PRIVATE libjpeg-turbo::libjpeg-turbo) # adjust to match built target name
117117

118-
if(CMAKE_GENERATOR STREQUAL "Ninja")
119-
add_custom_command(TARGET ${TargetName} POST_BUILD
118+
# ======== Copy runtime to ${CMAKE_CURRENT_BINARY_DIR} ========
119+
if(IS_MULTI_CONFIG)
120+
# Copy all configs' DLLs/SOs/DYLIBs
121+
foreach(cfg ${CMAKE_CONFIGURATION_TYPES})
122+
add_custom_command(TARGET ${TargetName} POST_BUILD
120123
COMMAND ${CMAKE_COMMAND} -E copy_if_different
121124
"$<TARGET_FILE:libjpeg-turbo::libjpeg-turbo>"
122-
"${CMAKE_CURRENT_BINARY_DIR}")
125+
"${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>/")
126+
127+
endforeach()
123128
else()
124129
add_custom_command(TARGET ${TargetName} POST_BUILD
125130
COMMAND ${CMAKE_COMMAND} -E copy_if_different
126131
"$<TARGET_FILE:libjpeg-turbo::libjpeg-turbo>"
127-
"${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>/")
132+
"${CMAKE_CURRENT_BINARY_DIR}")
128133
endif()
129134

130-
131-
135+
132136
target_include_directories(${TargetName} PRIVATE ${LibJpegTurboFolder}/src)
133137

134138
if (${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC") AND NOT MINGW)

0 commit comments

Comments
 (0)