From a764b8c64c53992e2208b55f546174485e2357b8 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Wed, 25 May 2022 22:03:14 -0400 Subject: [PATCH] Update obj2tiles, fix Windows path --- SuperBuild/cmake/External-Obj2Tiles.cmake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/SuperBuild/cmake/External-Obj2Tiles.cmake b/SuperBuild/cmake/External-Obj2Tiles.cmake index 739c02fc..ae61a8e7 100644 --- a/SuperBuild/cmake/External-Obj2Tiles.cmake +++ b/SuperBuild/cmake/External-Obj2Tiles.cmake @@ -1,13 +1,15 @@ set(_proj_name obj2tiles) set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}") -set(OBJ2TILES_VERSION v1.0.5) +set(OBJ2TILES_VERSION v1.0.6) +set(OBJ2TILES_EXT "") set(OBJ2TILES_ARCH "Linux64") if (WIN32) -set(OBJ2TILES_ARCH "Win64") + set(OBJ2TILES_ARCH "Win64") + set(OBJ2TILES_EXT ".exe") elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64") -set(OBJ2TILES_ARCH "LinuxArm") + set(OBJ2TILES_ARCH "LinuxArm") endif() @@ -23,7 +25,7 @@ ExternalProject_Add(${_proj_name} CONFIGURE_COMMAND "" BUILD_IN_SOURCE 1 BUILD_COMMAND "" - INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${SB_SOURCE_DIR}/${_proj_name}/Obj2Tiles ${SB_INSTALL_DIR}/bin + INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${SB_SOURCE_DIR}/${_proj_name}/Obj2Tiles${OBJ2TILES_EXT} ${SB_INSTALL_DIR}/bin #--Output logging------------- LOG_DOWNLOAD OFF LOG_CONFIGURE OFF