diff options
| -rw-r--r-- | cmake/modules/FindJsonSchemaBuilder.cmake | 15 | ||||
| -rw-r--r-- | cmake/modules/FindTexturePacker.cmake | 15 | ||||
| -rw-r--r-- | cmake/scripts/linux/Install.cmake | 1 | ||||
| -rw-r--r-- | docs/manpages/kodi-TexturePacker.1 (renamed from docs/manpages/TexturePacker.1) | 0 | ||||
| -rw-r--r-- | tools/depends/native/JsonSchemaBuilder/CMakeLists.txt | 3 |
5 files changed, 27 insertions, 7 deletions
diff --git a/cmake/modules/FindJsonSchemaBuilder.cmake b/cmake/modules/FindJsonSchemaBuilder.cmake index 094c2faaf8..1e9afdfba6 100644 --- a/cmake/modules/FindJsonSchemaBuilder.cmake +++ b/cmake/modules/FindJsonSchemaBuilder.cmake @@ -13,17 +13,26 @@ if(NOT TARGET JsonSchemaBuilder::JsonSchemaBuilder) if(KODI_DEPENDSBUILD) + get_filename_component(_jsbpath "${NATIVEPREFIX}/bin" ABSOLUTE) + find_program(JSONSCHEMABUILDER_EXECUTABLE NAMES "${APP_NAME_LC}-JsonSchemaBuilder" JsonSchemaBuilder + HINTS ${_jsbpath}) + add_executable(JsonSchemaBuilder::JsonSchemaBuilder IMPORTED GLOBAL) set_target_properties(JsonSchemaBuilder::JsonSchemaBuilder PROPERTIES - IMPORTED_LOCATION "${NATIVEPREFIX}/bin/JsonSchemaBuilder") + IMPORTED_LOCATION "${JSONSCHEMABUILDER_EXECUTABLE}") elseif(CORE_SYSTEM_NAME STREQUAL windowsstore) + get_filename_component(_jsbpath "${DEPENDENCIES_DIR}/bin/json-rpc" ABSOLUTE) + find_program(JSONSCHEMABUILDER_EXECUTABLE NAMES "${APP_NAME_LC}-JsonSchemaBuilder" JsonSchemaBuilder + HINTS ${_jsbpath}) + add_executable(JsonSchemaBuilder::JsonSchemaBuilder IMPORTED GLOBAL) set_target_properties(JsonSchemaBuilder::JsonSchemaBuilder PROPERTIES - IMPORTED_LOCATION "${DEPENDENCIES_DIR}/bin/json-rpc/JsonSchemaBuilder") + IMPORTED_LOCATION "${JSONSCHEMABUILDER_EXECUTABLE}") else() if(WITH_JSONSCHEMABUILDER) get_filename_component(_jsbpath ${WITH_JSONSCHEMABUILDER} ABSOLUTE) - find_program(JSONSCHEMABUILDER_EXECUTABLE JsonSchemaBuilder PATHS ${_jsbpath}) + find_program(JSONSCHEMABUILDER_EXECUTABLE NAMES "${APP_NAME_LC}-JsonSchemaBuilder" JsonSchemaBuilder + PATHS ${_jsbpath}) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(JsonSchemaBuilder DEFAULT_MSG JSONSCHEMABUILDER_EXECUTABLE) diff --git a/cmake/modules/FindTexturePacker.cmake b/cmake/modules/FindTexturePacker.cmake index 874a8f675b..20d2ef7ea0 100644 --- a/cmake/modules/FindTexturePacker.cmake +++ b/cmake/modules/FindTexturePacker.cmake @@ -13,17 +13,26 @@ if(NOT TARGET TexturePacker::TexturePacker) if(KODI_DEPENDSBUILD) + get_filename_component(_tppath "${NATIVEPREFIX}/bin" ABSOLUTE) + find_program(TEXTUREPACKER_EXECUTABLE NAMES "${APP_NAME_LC}-TexturePacker" TexturePacker + HINTS ${_tppath}) + add_executable(TexturePacker::TexturePacker IMPORTED GLOBAL) set_target_properties(TexturePacker::TexturePacker PROPERTIES - IMPORTED_LOCATION "${NATIVEPREFIX}/bin/TexturePacker") + IMPORTED_LOCATION "${TEXTUREPACKER_EXECUTABLE}") elseif(WIN32) + get_filename_component(_tppath "${DEPENDENCIES_DIR}/tools/TexturePacker" ABSOLUTE) + find_program(TEXTUREPACKER_EXECUTABLE NAMES "${APP_NAME_LC}-TexturePacker.exe" TexturePacker.exe + HINTS ${_tppath}) + add_executable(TexturePacker::TexturePacker IMPORTED GLOBAL) set_target_properties(TexturePacker::TexturePacker PROPERTIES - IMPORTED_LOCATION "${DEPENDENCIES_DIR}/tools/TexturePacker/TexturePacker.exe") + IMPORTED_LOCATION "${TEXTUREPACKER_EXECUTABLE}") else() if(WITH_TEXTUREPACKER) get_filename_component(_tppath ${WITH_TEXTUREPACKER} ABSOLUTE) - find_program(TEXTUREPACKER_EXECUTABLE TexturePacker PATHS ${_tppath}) + find_program(TEXTUREPACKER_EXECUTABLE NAMES "${APP_NAME_LC}-TexturePacker" TexturePacker + PATHS ${_tppath}) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(TexturePacker DEFAULT_MSG TEXTUREPACKER_EXECUTABLE) diff --git a/cmake/scripts/linux/Install.cmake b/cmake/scripts/linux/Install.cmake index 8a21c12c0f..b5c4dbfb02 100644 --- a/cmake/scripts/linux/Install.cmake +++ b/cmake/scripts/linux/Install.cmake @@ -157,6 +157,7 @@ install(FILES ${CMAKE_SOURCE_DIR}/privacy-policy.txt if(NOT WITH_TEXTUREPACKER) install(PROGRAMS $<TARGET_FILE:TexturePacker::TexturePacker> DESTINATION ${bindir} + RENAME "${APP_NAME_LC}-TexturePacker" COMPONENT kodi-tools-texturepacker) endif() diff --git a/docs/manpages/TexturePacker.1 b/docs/manpages/kodi-TexturePacker.1 index 553625b8c1..553625b8c1 100644 --- a/docs/manpages/TexturePacker.1 +++ b/docs/manpages/kodi-TexturePacker.1 diff --git a/tools/depends/native/JsonSchemaBuilder/CMakeLists.txt b/tools/depends/native/JsonSchemaBuilder/CMakeLists.txt index 54d2259c00..e1c6c210bb 100644 --- a/tools/depends/native/JsonSchemaBuilder/CMakeLists.txt +++ b/tools/depends/native/JsonSchemaBuilder/CMakeLists.txt @@ -6,4 +6,5 @@ set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) add_executable(JsonSchemaBuilder ${SOURCES}) -install(TARGETS JsonSchemaBuilder DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) +install(TARGETS JsonSchemaBuilder DESTINATION ${CMAKE_INSTALL_PREFIX}/bin + RENAME "${APP_NAME_LC}-JsonSchemaBuilder") |