Skip to content

Commit db85319

Browse files
committed
ICU: tweak build rules slightly
- Emit the stub data library into a subdirectory to prevent collisions - Remove the generated output from byproducts, it is the output
1 parent f1c1eec commit db85319

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

shared/ICU/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ endif()
7777
target_compile_definitions(icudt PRIVATE
7878
STUBDATA_BUILD)
7979
set_target_properties(icudt PROPERTIES
80+
ARCHIVE_OUTPUT_DIRECTORY stubs
8081
OUTPUT_NAME icudt${PROJECT_VERSION_MAJOR})
8182

8283
# icu common (unicode)
@@ -734,7 +735,7 @@ else()
734735
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/data/tmp/${U_ICUDATA_PKGN}_dat.S
735736
COMMAND $<TARGET_FILE:pkgdata> -f -e ${U_ICUDATA_NAME} -v -m $<IF:$<BOOL:${BUILD_SHARED_LIBS}>,dll,static> -c -p ${U_ICUDATA_PKGN} -T ${CMAKE_CURRENT_BINARY_DIR}/data/tmp -L ${U_ICUDATA_NAME} -d ${CMAKE_CURRENT_BINARY_DIR}/data/${U_ICUDATA_PKGN} -s ${CMAKE_CURRENT_BINARY_DIR}/data/${U_ICUDATA_PKGN} ${CMAKE_CURRENT_BINARY_DIR}/data/tmp/icudata.lst -O ${CMAKE_BINARY_DIR}/icupkg.inc
736737
DEPENDS pkgdata ${CMAKE_CURRENT_BINARY_DIR}/data/tmp/icudata.lst
737-
BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/data/tmp/${U_ICUDATA_PKGN}.dat ${CMAKE_CURRENT_BINARY_DIR}/data/tmp/${U_ICUDATA_PKGN}_dat.S)
738+
BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/data/tmp/${U_ICUDATA_PKGN}.dat)
738739

739740
add_library(${U_ICUDATA_NAME}
740741
${CMAKE_CURRENT_BINARY_DIR}/data/tmp/${U_ICUDATA_PKGN}_dat.S)

0 commit comments

Comments
 (0)