Skip to content

Commit 3b58bda

Browse files
committed
Update packaging naming scheme
1 parent 73885ef commit 3b58bda

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

cmake/packaging.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@ else()
1212
set(CPACK_GENERATOR TGZ) # MinGW/Cygwin/Linux/macOS etc use .tar.gz
1313
endif()
1414

15-
set (BARCH ${CMAKE_HOST_SYSTEM_PROCESSOR}) # Target architecture
15+
set (BARCH ${CMAKE_SYSTEM_PROCESSOR}) # Target architecture
1616
if ( CMAKE_SIZEOF_VOID_P EQUAL 4 )
1717
# 32-bit build, force architecture
1818
set (BARCH "i686")
1919
endif()
2020

2121
set (LT "") # Library Type
2222
if ( NOT BUILD_SHARED_LIBS )
23-
set (LT Static)
23+
set (LT -Static)
2424
endif()
2525

2626
set (BT "") # Build Type
2727
if ( NOT ${CMAKE_BUILD_TYPE} STREQUAL Release )
28-
set (BT ${CMAKE_BUILD_TYPE})
28+
set (BT -${CMAKE_BUILD_TYPE})
2929
endif()
3030

3131
if ( MINGW )
@@ -54,13 +54,13 @@ endif()
5454
set (CC "") # Compiler
5555
if ( 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()
5959
endif()
6060

6161
set (WR "") # WebReady
6262
if ( EXIV2_ENABLE_WEBREADY )
63-
set (WR Webready)
63+
set (WR -Webready)
6464
endif()
6565

6666
set (VS "") # VisualStudio
@@ -114,7 +114,7 @@ endif()
114114
# Set RV = Release Version
115115
set(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
120120
install(FILES "${PROJECT_SOURCE_DIR}/samples/exifprint.cpp" DESTINATION "samples")

0 commit comments

Comments
 (0)