Skip to content

Commit 620e401

Browse files
authored
Merge pull request xbmc#27545 from chewi/texturepacker-install
[cmake] Fix double installation of TexturePacker
2 parents 66abe46 + bb864e7 commit 620e401

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

cmake/modules/buildtools/FindTexturePacker.cmake

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ if(NOT TARGET TexturePacker::TexturePacker::Executable)
8282
"-DCMAKE_OBJDUMP=${CMAKE_OBJDUMP}"
8383
"-DCMAKE_RANLIB=${CMAKE_RANLIB}"
8484
"-DDEPENDS_PATH=${DEPENDS_PATH}"
85-
-DKODI_SOURCE_DIR=${CMAKE_SOURCE_DIR}
86-
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/build)
85+
-DKODI_SOURCE_DIR=${CMAKE_SOURCE_DIR})
8786

8887
# Create a list with an alternate separator e.g. pipe symbol
8988
string(REPLACE ";" "|" string_ARCH_DEFINES "${ARCH_DEFINES}")
@@ -110,15 +109,14 @@ if(NOT TARGET TexturePacker::TexturePacker::Executable)
110109
SOURCE_DIR ${CMAKE_SOURCE_DIR}/tools/depends/native/TexturePacker/src
111110
PREFIX ${CORE_BUILD_DIR}/build-texturepacker
112111
LIST_SEPARATOR |
113-
INSTALL_DIR ${CMAKE_BINARY_DIR}/build
112+
INSTALL_COMMAND ""
114113
CMAKE_ARGS ${CMAKE_ARGS}
115114
BUILD_ALWAYS ON
116-
BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/build/bin/TexturePacker)
115+
BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/build-texturepacker/src/buildtexturepacker-build/TexturePacker)
117116

118-
ExternalProject_Get_Property(buildtexturepacker INSTALL_DIR)
119117
add_executable(TexturePacker IMPORTED)
120118
set_target_properties(TexturePacker PROPERTIES
121-
IMPORTED_LOCATION "${INSTALL_DIR}/bin/TexturePacker")
119+
IMPORTED_LOCATION "${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/build-texturepacker/src/buildtexturepacker-build/TexturePacker")
122120

123121
add_dependencies(TexturePacker buildtexturepacker)
124122

0 commit comments

Comments
 (0)