Skip to content

Commit 0bb89b0

Browse files
committed
test2
1 parent 7284aa4 commit 0bb89b0

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

Codecs/CodecJPG/CMakeLists.txt

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ endif()
6565

6666
# ======== Declare Imported Library ========
6767
add_library(libjpeg-turbo::libjpeg-turbo SHARED IMPORTED GLOBAL)
68+
6869
set(JPG_IMPORTED_LOCATION "")
6970
set(JPG_IMPORTED_IMPLIB "")
7071

@@ -73,22 +74,26 @@ if(IS_MULTI_CONFIG)
7374
# Multi-config: set per-config imported locations
7475
foreach(cfg ${CMAKE_CONFIGURATION_TYPES})
7576
string(TOUPPER "${cfg}" cfg_upper)
76-
77+
list(APPEND JPG_IMPORTED_LOCATION "IMPORTED_LOCATION_${cfg_upper}" "${JPG_RUNTIME_OUTPUT_DIR}/${cfg}/${JPG_RUNTIME_NAME}")
7778
set_target_properties(libjpeg-turbo::libjpeg-turbo PROPERTIES
7879
"IMPORTED_LOCATION_${cfg_upper}" "${JPG_RUNTIME_OUTPUT_DIR}/${cfg}/${JPG_RUNTIME_NAME}")
7980
# Set import library on Windows
8081
if(WIN32)
82+
list(APPEND JPG_IMPORTED_IMPLIB "IMPORTED_IMPLIB_${cfg_upper}" "${JPG_LIB_OUTPUT_DIR}/${cfg}/${JPG_IMPLIB_NAME}")
8183
set_target_properties(libjpeg-turbo::libjpeg-turbo PROPERTIES
8284
"IMPORTED_IMPLIB_${cfg_upper}" "${JPG_LIB_OUTPUT_DIR}/${cfg}/${JPG_IMPLIB_NAME}")
8385
endif()
8486
endforeach()
8587
else()
88+
89+
set(JPG_IMPORTED_LOCATION "${JPG_RUNTIME_OUTPUT_DIR}/${JPG_RUNTIME_NAME}")
8690
# Single-config: flat directory
8791
set_target_properties(libjpeg-turbo::libjpeg-turbo PROPERTIES IMPORTED_LOCATION
8892
"${JPG_RUNTIME_OUTPUT_DIR}/${JPG_RUNTIME_NAME}")
8993

9094
# Set import library on Windows
9195
if(WIN32)
96+
set(JPG_IMPORTED_IMPLIB "${JPG_LIB_OUTPUT_DIR}/${JPG_IMPLIB_NAME}")
9297
set_target_properties(libjpeg-turbo::libjpeg-turbo PROPERTIES IMPORTED_IMPLIB
9398
"${JPG_LIB_OUTPUT_DIR}/${JPG_IMPLIB_NAME}")
9499
endif()
@@ -99,15 +104,19 @@ set_target_properties(libjpeg-turbo::libjpeg-turbo PROPERTIES
99104
INTERFACE_INCLUDE_DIRECTORIES "${LibJpegTurboFolder}/src"
100105
)
101106

107+
list ( APPEND JPG_BYPRODUCTS ${JPG_IMPORTED_LOCATION} )
108+
if (WIN32)
109+
list (APPEND JPG_BYPRODUCTS ${JPG_IMPORTED_IMPLIB} )
110+
endif()
111+
102112
# ======== Add ExternalProject ========
103113
ExternalProject_Add(libjpeg-turbo
104114
SOURCE_DIR ${LibJpegTurboFolder}
105115
BINARY_DIR ${TurboJpegBinBaseDir}
106116
CMAKE_ARGS ${LibJpegTurboArgs}
107117
INSTALL_COMMAND ""
108118
BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> --target turbojpeg
109-
BYPRODUCTS ${JPG_IMPORTED_LOCATION}
110-
$<$<PLATFORM_ID:Windows>:${JPG_IMPORTED_IMPLIB}>
119+
BYPRODUCTS ${JPG_BYPRODUCTS}
111120
)
112121

113122
# ======== Depend on ExternalProject ========

0 commit comments

Comments
 (0)