From 5d2c2b27a6323e2666378b986129b2a7c2c39e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 6 Feb 2022 16:04:24 +0100 Subject: New upstream version 5.2.2GA --- CMake/FindLibzip.cmake | 60 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 17 deletions(-) (limited to 'CMake/FindLibzip.cmake') diff --git a/CMake/FindLibzip.cmake b/CMake/FindLibzip.cmake index b6f1a9e..004a88d 100644 --- a/CMake/FindLibzip.cmake +++ b/CMake/FindLibzip.cmake @@ -10,23 +10,44 @@ # if(WIN32) - find_path( LIBZIP_INCLUDE_DIR_ZIP zip.h - PATHS - $ENV{XTCEXTERNALROOT}/x86/libzip - DOC "The directory where zip.h resides") - find_path( LIBZIP_INCLUDE_DIR_ZIPCONF zipconf.h - PATHS - $ENV{XTCEXTERNALROOT}/x86/libzip - DOC "The directory where zip.h resides") - find_library( LIBZIP_LIBRARY - NAMES zip Zip - PATHS - $ENV{XTCEXTERNALROOT}/x86/libzip - DOC "The libzip library") - find_file( LIBZIP_SHAREDLIB - NAMES zip.dll Zip.dll - PATHS - $ENV{XTCEXTERNALROOT}/x86/libzip) + # Folders for x86/x64 + if (WIN64) + find_path( LIBZIP_INCLUDE_DIR_ZIP zip.h + PATHS + $ENV{XTCEXTERNALROOT}/x64/libzip + DOC "The directory where zip.h resides") + find_path( LIBZIP_INCLUDE_DIR_ZIPCONF zipconf.h + PATHS + $ENV{XTCEXTERNALROOT}/x64/libzip + DOC "The directory where zip.h resides") + find_library( LIBZIP_LIBRARY + NAMES zip Zip + PATHS + $ENV{XTCEXTERNALROOT}/x64/libzip + DOC "The libzip library") + find_file( LIBZIP_SHAREDLIB + NAMES zip.dll Zip.dll + PATHS + $ENV{XTCEXTERNALROOT}/x64/libzip) + else (WIN64) + find_path( LIBZIP_INCLUDE_DIR_ZIP zip.h + PATHS + $ENV{XTCEXTERNALROOT}/x86/libzip + DOC "The directory where zip.h resides") + find_path( LIBZIP_INCLUDE_DIR_ZIPCONF zipconf.h + PATHS + $ENV{XTCEXTERNALROOT}/x86/libzip + DOC "The directory where zip.h resides") + find_library( LIBZIP_LIBRARY + NAMES zip Zip + PATHS + $ENV{XTCEXTERNALROOT}/x86/libzip + DOC "The libzip library") + find_file( LIBZIP_SHAREDLIB + NAMES zip.dll Zip.dll + PATHS + $ENV{XTCEXTERNALROOT}/x86/libzip) + endif (WIN64) else(WIN32) find_package(PkgConfig) pkg_check_modules(PC_LIBZIP QUIET libzip) @@ -39,8 +60,13 @@ else(WIN32) NAMES zipconf.h HINTS ${PC_LIBZIP_INCLUDE_DIRS}) +if(UNIX AND NOT APPLE) + find_library(LIBZIP_LIBRARY + NAMES libzip.a zip) +else(UNIX AND NOT APPLE) find_library(LIBZIP_LIBRARY NAMES zip) +endif(UNIX AND NOT APPLE) endif(WIN32) include(FindPackageHandleStandardArgs) -- cgit v1.2.3 From a14a7a0ccc9de76aeab0b2e4bbf58f1a79deedc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 3 Jul 2024 10:19:30 +0200 Subject: New upstream version 5.3.0GA --- CMake/FindLibzip.cmake | 105 ++++++++++++++++++++++++------------------------- 1 file changed, 52 insertions(+), 53 deletions(-) (limited to 'CMake/FindLibzip.cmake') diff --git a/CMake/FindLibzip.cmake b/CMake/FindLibzip.cmake index 004a88d..8838a86 100644 --- a/CMake/FindLibzip.cmake +++ b/CMake/FindLibzip.cmake @@ -4,50 +4,26 @@ # LIBZIP_INCLUDE_DIR_ZIP # LIBZIP_INCLUDE_DIR_ZIPCONF # LIBZIP_LIBRARY +# LIBZIP_VERSION +# +# Target Libzip::Libzip is exported # # There is no default installation for libzip on Windows so a # XTrackCAD specific directory tree is assumed # if(WIN32) - # Folders for x86/x64 - if (WIN64) - find_path( LIBZIP_INCLUDE_DIR_ZIP zip.h - PATHS - $ENV{XTCEXTERNALROOT}/x64/libzip - DOC "The directory where zip.h resides") - find_path( LIBZIP_INCLUDE_DIR_ZIPCONF zipconf.h - PATHS - $ENV{XTCEXTERNALROOT}/x64/libzip - DOC "The directory where zip.h resides") - find_library( LIBZIP_LIBRARY - NAMES zip Zip - PATHS - $ENV{XTCEXTERNALROOT}/x64/libzip - DOC "The libzip library") - find_file( LIBZIP_SHAREDLIB - NAMES zip.dll Zip.dll - PATHS - $ENV{XTCEXTERNALROOT}/x64/libzip) - else (WIN64) - find_path( LIBZIP_INCLUDE_DIR_ZIP zip.h - PATHS - $ENV{XTCEXTERNALROOT}/x86/libzip + set(LIBZIPBASEDIR "$ENV{XTCEXTERNALROOT}/${XTRKCAD_ARCH_SUBDIR}/libzip" ) + find_path( LIBZIP_INCLUDE_DIR_ZIP zip.h + PATHS ${LIBZIPBASEDIR} "${LIBZIPBASEDIR}/include" DOC "The directory where zip.h resides") - find_path( LIBZIP_INCLUDE_DIR_ZIPCONF zipconf.h - PATHS - $ENV{XTCEXTERNALROOT}/x86/libzip + find_path( LIBZIP_INCLUDE_DIR_ZIPCONF zipconf.h + PATHS ${LIBZIPBASEDIR} "${LIBZIPBASEDIR}/include" DOC "The directory where zip.h resides") - find_library( LIBZIP_LIBRARY - NAMES zip Zip - PATHS - $ENV{XTCEXTERNALROOT}/x86/libzip + find_library( LIBZIP_LIBRARY + NAMES zip Zip + PATHS ${LIBZIPBASEDIR} "${LIBZIPBASEDIR}/lib" DOC "The libzip library") - find_file( LIBZIP_SHAREDLIB - NAMES zip.dll Zip.dll - PATHS - $ENV{XTCEXTERNALROOT}/x86/libzip) - endif (WIN64) else(WIN32) find_package(PkgConfig) pkg_check_modules(PC_LIBZIP QUIET libzip) @@ -60,28 +36,51 @@ else(WIN32) NAMES zipconf.h HINTS ${PC_LIBZIP_INCLUDE_DIRS}) -if(UNIX AND NOT APPLE) - find_library(LIBZIP_LIBRARY - NAMES libzip.a zip) -else(UNIX AND NOT APPLE) - find_library(LIBZIP_LIBRARY - NAMES zip) -endif(UNIX AND NOT APPLE) + if(UNIX AND NOT APPLE) + find_library(LIBZIP_LIBRARY + NAMES libzip.a zip + PATHS + /usr/lib64 + /usr/lib + /usr/local/lib64 + /usr/local/lib + /sw/lib + /opt/local/lib + ${CMAKE_CURRENT_SOURCE_DIR}/app/tools/lib/linux + ) + else() + find_library(LIBZIP_LIBRARY + NAMES zip) + endif() endif(WIN32) include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS( - LIBZIP DEFAULT_MSG - LIBZIP_LIBRARY LIBZIP_INCLUDE_DIR_ZIP LIBZIP_INCLUDE_DIR_ZIPCONF) +find_package_handle_standard_args( + Libzip + REQUIRED_VARS + LIBZIP_LIBRARY LIBZIP_INCLUDE_DIR_ZIP LIBZIP_INCLUDE_DIR_ZIPCONF +) + +if(Libzip_FOUND) + mark_as_advanced( + LIBZIP_LIBRARY + LIBZIP_INCLUDE_DIR_ZIP + LIBZIP_INCLUDE_DIR_ZIPCONF + ) +endif() set(LIBZIP_VERSION 0) -if (LIBZIP_INCLUDE_DIR_ZIPCONF) - FILE(READ "${LIBZIP_INCLUDE_DIR_ZIPCONF}/zipconf.h" _LIBZIP_VERSION_CONTENTS) - if (_LIBZIP_VERSION_CONTENTS) - STRING(REGEX REPLACE ".*#define LIBZIP_VERSION \"([0-9a-z.]+)\".*" "\\1" LIBZIP_VERSION "${_LIBZIP_VERSION_CONTENTS}") - endif () -endif () +if(Libzip_FOUND AND NOT TARGET Libzip::Libzip) + add_library(Libzip::Libzip UNKNOWN IMPORTED) + set_property(TARGET Libzip::Libzip PROPERTY IMPORTED_LOCATION ${LIBZIP_LIBRARY}) + target_include_directories(Libzip::Libzip INTERFACE ${LIBZIP_INCLUDE_DIR_ZIP}) -set(LIBZIP_VERSION ${LIBZIP_VERSION} CACHE STRING "Version number of libzip") -mark_as_advanced(LIBZIP_LIBRARY LIBZIP_INCLUDE_DIR_ZIP LIBZIP_INCLUDE_DIR_ZIPCONF LIBZIP_SHAREDLIB) + if (LIBZIP_INCLUDE_DIR_ZIPCONF) + file(READ "${LIBZIP_INCLUDE_DIR_ZIPCONF}/zipconf.h" _LIBZIP_VERSION_CONTENTS) + if (_LIBZIP_VERSION_CONTENTS) + string(REGEX REPLACE ".*#define LIBZIP_VERSION \"([0-9a-z.]+)\".*" "\\1" LIBZIP_VERSION "${_LIBZIP_VERSION_CONTENTS}") + endif () + endif () + set(LIBZIP_VERSION ${LIBZIP_VERSION} CACHE STRING "Version number of libzip") +endif() -- cgit v1.2.3