@@ -12,20 +12,20 @@ else()
1212 set (CPACK_GENERATOR TGZ) # MinGW/Cygwin/Linux/macOS etc use .tar.gz
1313endif ()
1414
15- set (BARCH ${CMAKE_HOST_SYSTEM_PROCESSOR } ) # Target architecture
15+ set (BARCH ${CMAKE_SYSTEM_PROCESSOR } ) # Target architecture
1616if ( CMAKE_SIZEOF_VOID_P EQUAL 4 )
1717 # 32-bit build, force architecture
1818 set (BARCH "i686" )
1919endif ()
2020
2121set (LT "" ) # Library Type
2222if ( NOT BUILD_SHARED_LIBS )
23- set (LT Static )
23+ set (LT - Static )
2424endif ()
2525
2626set (BT "" ) # Build Type
2727if ( NOT ${CMAKE_BUILD_TYPE} STREQUAL Release )
28- set (BT ${CMAKE_BUILD_TYPE} )
28+ set (BT - ${CMAKE_BUILD_TYPE} )
2929endif ()
3030
3131if ( MINGW )
@@ -54,13 +54,13 @@ endif()
5454set (CC "" ) # Compiler
5555if ( NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" )
5656 if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" )
57- set (CC Clang)
57+ set (CC - Clang)
5858 endif ()
5959endif ()
6060
6161set (WR "" ) # WebReady
6262if ( EXIV2_ENABLE_WEBREADY )
63- set (WR Webready)
63+ set (WR - Webready)
6464endif ()
6565
6666set (VS "" ) # VisualStudio
@@ -114,7 +114,7 @@ endif()
114114# Set RV = Release Version
115115set (RV "Exiv2 v${PROJECT_VERSION_MAJOR} .${PROJECT_VERSION_MINOR} .${PROJECT_VERSION_PATCH} " )
116116
117- set (CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME} -${CPACK_PACKAGE_VERSION} -${BARCH} - ${VS}${BUNDLE_NAME }${CC}${LT}${BT}${WR} )
117+ set (CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME} -${CPACK_PACKAGE_VERSION} -${VS}${BUNDLE_NAME} - ${BARCH }${CC}${LT}${BT}${WR} )
118118
119119# https://stackoverflow.com/questions/17495906/copying-files-and-including-them-in-a-cpack-archive
120120install (FILES "${PROJECT_SOURCE_DIR} /samples/exifprint.cpp" DESTINATION "samples" )
0 commit comments