From fb21f3cca06e9ff367795ed47e6bb93a9cfcfcba Mon Sep 17 00:00:00 2001 From: Photonios Date: Fri, 22 Nov 2013 17:31:07 +0100 Subject: [PATCH 01/11] Added Git ignore file to prevent build files being seen as changed files --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6b65910 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +Debug +ipch +*.vcxproj.user +*.opensdf +*.sdf +*.suo \ No newline at end of file From d0882077b352991124f398280395a5bc2e6d3faa Mon Sep 17 00:00:00 2001 From: Photonios Date: Fri, 22 Nov 2013 17:32:40 +0100 Subject: [PATCH 02/11] Added configuration options for x64 to vs2010 solution/project file --- gflags-vs2010.sln | 14 ++- .../gflags_unittest-vs2010.vcxproj | 73 ++++++++++++++++ vsprojects/libgflags/libgflags-vs2010.vcxproj | 87 +++++++++++++++++++ 3 files changed, 172 insertions(+), 2 deletions(-) diff --git a/gflags-vs2010.sln b/gflags-vs2010.sln index 5c34be4..f195d66 100644 --- a/gflags-vs2010.sln +++ b/gflags-vs2010.sln @@ -1,23 +1,33 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgflags", "vsprojects\libgflags\libgflags-vs2010.vcxproj", "{FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgflags-vs2010", "vsprojects\libgflags\libgflags-vs2010.vcxproj", "{FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gflags_unittest", "vsprojects\gflags_unittest\gflags_unittest-vs2010.vcxproj", "{4B263748-5F0F-468C-8C5C-ED2682BB6BE3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gflags_unittest-vs2010", "vsprojects\gflags_unittest\gflags_unittest-vs2010.vcxproj", "{4B263748-5F0F-468C-8C5C-ED2682BB6BE3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}.Debug|Win32.ActiveCfg = Debug|Win32 {FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}.Debug|Win32.Build.0 = Debug|Win32 + {FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}.Debug|x64.ActiveCfg = Debug|x64 + {FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}.Debug|x64.Build.0 = Debug|x64 {FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}.Release|Win32.ActiveCfg = Release|Win32 {FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}.Release|Win32.Build.0 = Release|Win32 + {FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}.Release|x64.ActiveCfg = Release|x64 + {FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}.Release|x64.Build.0 = Release|x64 {4B263748-5F0F-468C-8C5C-ED2682BB6BE3}.Debug|Win32.ActiveCfg = Debug|Win32 {4B263748-5F0F-468C-8C5C-ED2682BB6BE3}.Debug|Win32.Build.0 = Debug|Win32 + {4B263748-5F0F-468C-8C5C-ED2682BB6BE3}.Debug|x64.ActiveCfg = Debug|x64 + {4B263748-5F0F-468C-8C5C-ED2682BB6BE3}.Debug|x64.Build.0 = Debug|x64 {4B263748-5F0F-468C-8C5C-ED2682BB6BE3}.Release|Win32.ActiveCfg = Release|Win32 {4B263748-5F0F-468C-8C5C-ED2682BB6BE3}.Release|Win32.Build.0 = Release|Win32 + {4B263748-5F0F-468C-8C5C-ED2682BB6BE3}.Release|x64.ActiveCfg = Release|x64 + {4B263748-5F0F-468C-8C5C-ED2682BB6BE3}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vsprojects/gflags_unittest/gflags_unittest-vs2010.vcxproj b/vsprojects/gflags_unittest/gflags_unittest-vs2010.vcxproj index 77bd3f5..6624350 100644 --- a/vsprojects/gflags_unittest/gflags_unittest-vs2010.vcxproj +++ b/vsprojects/gflags_unittest/gflags_unittest-vs2010.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {4B263748-5F0F-468C-8C5C-ED2682BB6BE3} @@ -19,34 +27,60 @@ Application MultiByte + + Application + MultiByte + Application MultiByte + + Application + MultiByte + + + + + + + <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ true + true $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ false + false AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + @@ -68,6 +102,24 @@ MachineX86 + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + $(OutDir)gflags_unittest.exe + true + $(OutDir)gflags_unittest.pdb + Console + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -86,12 +138,33 @@ MachineX86 + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + $(OutDir)gflags_unittest.exe + true + Console + true + true + + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + MultiThreadedDebugDLL ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) MultiThreadedDLL + MultiThreadedDLL diff --git a/vsprojects/libgflags/libgflags-vs2010.vcxproj b/vsprojects/libgflags/libgflags-vs2010.vcxproj index 7b9d36c..2e9f397 100644 --- a/vsprojects/libgflags/libgflags-vs2010.vcxproj +++ b/vsprojects/libgflags/libgflags-vs2010.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC} @@ -20,34 +28,60 @@ DynamicLibrary MultiByte + + DynamicLibrary + MultiByte + DynamicLibrary MultiByte + + DynamicLibrary + MultiByte + + + + + + + <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ true + true $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ false + false AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + @@ -70,6 +104,25 @@ MachineX86 + + + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGFLAGS_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + $(OutDir)libgflags-debug.dll + true + $(OutDir)libgflags-debug.pdb + Windows + $(OutDir)libgflags-debug.lib + + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGFLAGS_EXPORTS;%(PreprocessorDefinitions) @@ -89,30 +142,64 @@ MachineX86 + + + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGFLAGS_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + $(OutDir)libgflags.dll + true + Windows + true + true + $(OutDir)libgflags.lib + + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + MultiThreadedDebugDLL ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) MultiThreadedDLL + MultiThreadedDLL ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + MultiThreadedDebugDLL ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) MultiThreadedDLL + MultiThreadedDLL ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + MultiThreadedDebugDLL ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) MultiThreadedDLL + MultiThreadedDLL ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + MultiThreadedDebugDLL ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) + ..\..\src\windows; ..\..\src;%(AdditionalIncludeDirectories) MultiThreadedDLL + MultiThreadedDLL From 2bd1aeeeb7829c232d5bb7a0ed94a82767f3b5a6 Mon Sep 17 00:00:00 2001 From: Swen Kooij Date: Wed, 27 Nov 2013 18:04:40 +0100 Subject: [PATCH 03/11] Renamed projects in VS2012 solution file to match the filename --- gflags-vs2012.sln | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gflags-vs2012.sln b/gflags-vs2012.sln index dea7012..eb15d17 100644 --- a/gflags-vs2012.sln +++ b/gflags-vs2012.sln @@ -1,8 +1,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Express 2012 for Windows Desktop -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgflags", "vsprojects\libgflags\libgflags-vs2012.vcxproj", "{FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgflags-vs2012", "vsprojects\libgflags\libgflags-vs2012.vcxproj", "{FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gflags_unittest", "vsprojects\gflags_unittest\gflags_unittest-vs2012.vcxproj", "{4B263748-5F0F-468C-8C5C-ED2682BB6BE3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gflags_unittest-vs2012", "vsprojects\gflags_unittest\gflags_unittest-vs2012.vcxproj", "{4B263748-5F0F-468C-8C5C-ED2682BB6BE3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution From 38b662ab07be9a32dd1d0c644b8ac2ae591bb0a4 Mon Sep 17 00:00:00 2001 From: Swen Kooij Date: Wed, 27 Nov 2013 18:05:06 +0100 Subject: [PATCH 04/11] Renamed projects in VS2003 solution file to match the filename --- gflags-vs2003.sln | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gflags-vs2003.sln b/gflags-vs2003.sln index ec25b09..bff7f6d 100644 --- a/gflags-vs2003.sln +++ b/gflags-vs2003.sln @@ -1,9 +1,9 @@ Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgflags", "vsprojects\libgflags\libgflags-vs2003.vcproj", "{FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgflags-vs2003", "vsprojects\libgflags\libgflags-vs2003.vcproj", "{FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gflags_unittest", "vsprojects\gflags_unittest\gflags_unittest-vs2003.vcproj", "{4B263748-5F0F-468C-8C5C-ED2682BB6BE3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gflags_unittest-vs2003", "vsprojects\gflags_unittest\gflags_unittest-vs2003.vcproj", "{4B263748-5F0F-468C-8C5C-ED2682BB6BE3}" ProjectSection(ProjectDependencies) = postProject {FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC} = {FB27FBDB-E6C0-4D00-A7F8-1EEEF1B48ABC} EndProjectSection From ec4ddb403a61e958fc2620878b26453676049b82 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Wed, 19 Mar 2014 17:56:32 +0000 Subject: [PATCH 05/11] Revert "Added Git ignore file to prevent build files being seen as changed files" This reverts commit fb21f3cca06e9ff367795ed47e6bb93a9cfcfcba. --- .gitignore | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 6b65910..0000000 --- a/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -Debug -ipch -*.vcxproj.user -*.opensdf -*.sdf -*.suo \ No newline at end of file From 76f2ffadb4f393ed0c850f8cdd83307a680b97f2 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 16:02:15 +0000 Subject: [PATCH 06/11] Add ChangeLog entries for v2.1 release. --- ChangeLog.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 4476a99..347b701 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,13 @@ +* Thu Mar 20 2014 - Andreas Schuh + +- gflags: version 2.1.0 +- Build system configuration using CMake instead of autotools +- CPack packaging support for Debian/Ubuntu, Red Hat, and Mac OS X +- Fixed issue 54: Fix "invalid suffix on literal" (C++11) +- Fixed issue 57: Use _strdup instead of strdup on Windows +- Fixed issue 62: Change all preprocessor include guards to start with GFLAGS_ +- Fixed issue 64: Add DEFINE_validator macro + * Wed Jan 25 2012 - Google Inc. - gflags: version 2.0 From 0100be50ece23f5708f54246a132051168526f3c Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 16:15:10 +0000 Subject: [PATCH 07/11] Add missing entry to ChangeLog for v2.1 release. --- ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 347b701..9771549 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,6 +7,7 @@ - Fixed issue 57: Use _strdup instead of strdup on Windows - Fixed issue 62: Change all preprocessor include guards to start with GFLAGS_ - Fixed issue 64: Add DEFINE_validator macro +- Fixed issue 73: Warnings in Visual Studio 2010 and unable to compile unit test * Wed Jan 25 2012 - Google Inc. From 3e96a19026c384dae208f2d4db95b938a987772d Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 16:19:00 +0000 Subject: [PATCH 08/11] Change version to 2.1.0, i.e., use common semantic versioning system including patch number for bug fix releases. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 759fcb2..34dc4b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ include (utils) # ---------------------------------------------------------------------------- # package information set (PACKAGE_NAME "gflags") -set (PACKAGE_VERSION "2.1") +set (PACKAGE_VERSION "2.1.0") set (PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set (PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") set (PACKAGE_BUGREPORT "https://code.google.com/p/gflags/issues/") From 33e2cbe2c63bdc94b5e5add7ccf7d38f3cca35e1 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 16:32:54 +0000 Subject: [PATCH 09/11] Add release notes. --- NEWS.txt | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/NEWS.txt b/NEWS.txt index f049345..4d976d7 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,3 +1,37 @@ +=== 20 March 2014 === + +I've just released gflags 2.1.0. + +The major changes are the use of CMake for the build configuration instead +of the autotools and packaging support through CPack. This release compiles +with all major compilers without warnings and passed the unit tests on +Ubuntu 12.04, Windows 7 (Visual Studio 2008 and 2010, Cygwin, MinGW), and +Mac OS X (Xcode 5.1). + +The SVN repository on Google Code is now frozen and replaced by a Git +repository such that it can be used as Git submodule by projects. The main +hosting of this project remains at Google Code. Thanks to the distributed +character of Git, I can push (and pull) changes from both GitHub and Google Code +in order to keep the two public repositories in sync. +When fixing an issue for a pull request through either of these hosting +platforms, please reference the issue number as +[https://code.google.com/p/support/wiki/IssueTracker#Integration_with_version_control described here]. + +Binary and source distribution packages can be downloaded from +[https://github.com/schuhschuh/gflags GitHub] as Google Code no longer +permits the upload of such download packages. + + +=== 14 January 2013 === + +The migration of the build system to CMake is almost complete. +What remains to be done is rewriting the tests in Python such they can be +executed on non-Unix platforms and splitting them up into separate CTest tests. +Though merging these changes into the master branch yet remains to be done, +it is recommended to already start using the +[https://github.com/schuhschuh/gflags/tree/cmake-migration cmake-migration] branch. + + === 20 April 2013 === More than a year has past since I (Andreas) took over the maintenance for From 882db5d018c813cf8f037de4d4d6d9e876dd8804 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 16:35:30 +0000 Subject: [PATCH 10/11] Mention Git branching model in NEWS. --- NEWS.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS.txt b/NEWS.txt index 4d976d7..b9a68f3 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -16,6 +16,10 @@ in order to keep the two public repositories in sync. When fixing an issue for a pull request through either of these hosting platforms, please reference the issue number as [https://code.google.com/p/support/wiki/IssueTracker#Integration_with_version_control described here]. +For the further development, I am following the +[http://nvie.com/posts/a-successful-git-branching-model/ Git branching model] +with feature branch names prefixed by "feature/" and bugfix branch names +prefixed by "bugfix/", respectively. Binary and source distribution packages can be downloaded from [https://github.com/schuhschuh/gflags GitHub] as Google Code no longer From d699559081ff610f905f512b3a923bd9cabc19f0 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 20:21:30 +0000 Subject: [PATCH 11/11] Fix architecture used for RPM packages and DEB/RPM package file names. --- CMakeLists.txt | 26 +++++++++++++++++++++----- cmake/package.cmake.in | 31 +++++++------------------------ 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 34dc4b4..93d3a73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -366,15 +366,31 @@ if (BUILD_PACKAGING) set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_LIST_DIR}/cmake/README_runtime.txt") endif () - # system name used for binary package file name + # system/architecture if (WINDOWS) if (CMAKE_CL_64) set (CPACK_SYSTEM_NAME "win64") else () set (CPACK_SYSTEM_NAME "win32") endif () + set (CPACK_PACKAGE_ARCHITECTURE) else () string (TOLOWER "${CMAKE_SYSTEM_NAME}" CPACK_SYSTEM_NAME) + execute_process ( + COMMAND dpkg --print-architecture + RESULT_VARIABLE RV + OUTPUT_VARIABLE CPACK_PACKAGE_ARCHITECTURE + ) + if (RV EQUAL 0) + string (STRIP "${CPACK_PACKAGE_ARCHITECTURE}" CPACK_PACKAGE_ARCHITECTURE) + else () + execute_process (COMMAND uname -m OUTPUT_VARIABLE CPACK_PACKAGE_ARCHITECTURE) + if (CPACK_PACKAGE_ARCHITECTURE MATCHES "x86_64") + set (CPACK_PACKAGE_ARCHITECTURE amd64) + else () + set (CPACK_PACKAGE_ARCHITECTURE i386) + endif () + endif () endif () # source package settings @@ -383,10 +399,10 @@ if (BUILD_PACKAGING) set (CPACK_SOURCE_IGNORE_FILES "/\\\\.git/;\\\\.swp$;\\\\.#;/#;\\\\.*~;cscope\\\\.*;/[Bb]uild[.+-_a-zA-Z0-9]*/") # default binary package settings - set (CPACK_INCLUDE_TOPLEVEL_DIRECTORY TRUE) - set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}") - if (CMAKE_SYSTEM_PROCESSOR) - set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${CMAKE_SYSTEM_PROCESSOR}") + set (CPACK_INCLUDE_TOPLEVEL_DIRECTORY TRUE) + set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}") + if (CPACK_PACKAGE_ARCHITECTURE) + set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${CPACK_PACKAGE_ARCHITECTURE}") endif () # generator specific configuration file diff --git a/cmake/package.cmake.in b/cmake/package.cmake.in index f0b9fd0..aaec792 100644 --- a/cmake/package.cmake.in +++ b/cmake/package.cmake.in @@ -27,40 +27,23 @@ elseif (CPACK_GENERATOR MATCHES "DEB") else () set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}0") endif () - set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}_${CPACK_PACKAGE_VERSION}-1_${CMAKE_SYSTEM_PROCESSOR}") - - execute_process ( - COMMAND dpkg --print-architecture - RESULT_VARIABLE RV - OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE - ) - if (NOT RV EQUAL 0) - set (CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386) - endif () + set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}_${CPACK_PACKAGE_VERSION}-1_${CPACK_PACKAGE_ARCHITECTURE}") set (CPACK_DEBIAN_PACKAGE_DEPENDS) - set (CPACK_DEBIAN_PACKAGE_SECTION "devel") - set (CPACK_DEBIAN_PACKAGE_PRIORITY "optional") - set (CPACK_DEBIAN_PACKAGE_HOMEPAGE "${CPACK_RPM_PACKAGE_URL}") - set (CPACK_DEBIAN_PACKAGE_MAINTAINER "${CPACK_PACKAGE_VENDOR}") + set (CPACK_DEBIAN_PACKAGE_SECTION "devel") + set (CPACK_DEBIAN_PACKAGE_PRIORITY "optional") + set (CPACK_DEBIAN_PACKAGE_HOMEPAGE "${CPACK_RPM_PACKAGE_URL}") + set (CPACK_DEBIAN_PACKAGE_MAINTAINER "${CPACK_PACKAGE_VENDOR}") + set (CPACK_DEBIAN_PACKAGE_ARCHITECTURE "${CPACK_PACKAGE_ARCHITECTURE}") # ------------------------------------------------------------------------------ # RPM package elseif (CPACK_GENERATOR MATCHES "RPM") - execute_process ( - COMMAND dpkg --print-architecture - RESULT_VARIABLE RV - OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE - ) - if (NOT RV EQUAL 0) - set (CPACK_RPM_PACKAGE_ARCHITECTURE i386) - endif () - set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}") if (DEVEL) set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-devel") endif () - set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${CPACK_PACKAGE_VERSION}-1_${CMAKE_SYSTEM_PROCESSOR}") + set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${CPACK_PACKAGE_VERSION}-1.${CPACK_PACKAGE_ARCHITECTURE}") endif ()