From dd030fc6392dd7eda13ed315670614f7aca19d43 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 28 Oct 2018 06:12:56 +0000 Subject: [PATCH] Fix FreeBSD to copy releasenotes/Linux/ReadMe.txt (#497) --- cmake/packaging.cmake | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/cmake/packaging.cmake b/cmake/packaging.cmake index ac7498a4..f2f8b3c6 100644 --- a/cmake/packaging.cmake +++ b/cmake/packaging.cmake @@ -5,8 +5,6 @@ set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) set(CPACK_SOURCE_GENERATOR TGZ) set(CPACK_SOURCE_IGNORE_FILES "build.*;\.git/;\.DS_Store;") -## ----------------------------------------------- -## TODO: Luis will rewrite this ----------------- if ( MINGW OR MSYS ) if ( CMAKE_SIZEOF_VOID_P EQUAL 8 ) set (PACKNAME MinGW-64) @@ -17,17 +15,18 @@ if ( MINGW OR MSYS ) elseif ( MSVC ) set (PACKNAME MSVC) set (PACKDIR MSVC) -else() +elseif ( APPLE OR LINUX OR CYGWIN ) set (PACKNAME ${CMAKE_SYSTEM_NAME}) # Darwin or Linux or CYGWIN set (PACKDIR ${PACKNAME}) +else() + set (PACKNAME Linux ) # unsupported systems such as FreeBSD + set (PACKDIR ${PACKNAME}) endif() -if ( CYGWIN OR MINGW OR MSYS ) - set(CPACK_GENERATOR TGZ) # MinGW/Cygwin use .tar.gz -elseif ( MSVC ) - set(CPACK_GENERATOR ZIP) # use .zip - less likely to damage bin/exiv2lib.dll permissions +if ( MSVC ) + set(CPACK_GENERATOR ZIP) # use .zip - less likely to damage bin/exiv2.dll permissions else() - set(CPACK_GENERATOR TGZ) # Linux or MacOS-X: use .tar.gz + set(CPACK_GENERATOR TGZ) # MinGW/Cygwin/Linux/MacOS-X etc use .tar.gz endif() set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${PACKNAME}) @@ -51,7 +50,4 @@ endforeach() install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/releasenotes/${PACKDIR}/ReadMe.txt DESTINATION .) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/releasenotes/releasenotes.txt DESTINATION .) -## TODO: End ----------------- -## ----------------------------------------------- - include (CPack)