Improved version of PR #608

CMakeLists.txt

@@ -741,11 +741,11 @@ else(TFEL_APPEND_SUFFIX)
     PATTERN ".svn" EXCLUDE)
 endif(TFEL_APPEND_SUFFIX)
 
-set(CPACK_PACKAGE_VERSION   "${CMAKE_PROJECT_NAME}-${TFEL_VERSION}")
+set(CPACK_PACKAGE_VERSION   "${TFEL_VERSION}")
 if(${CMAKE_SYSTEM_PROCESSOR})
-  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_PROCESSOR}") 
+  set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_PROCESSOR}") 
 else(${CMAKE_SYSTEM_PROCESSOR})
-  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_VERSION}") 
+  set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}") 
 endif(${CMAKE_SYSTEM_PROCESSOR})
 set(CPACK_PACKAGE_INSTALL_DIRECTORY   "${CPACK_PACKAGE_VERSION}")
 set(CPACK_PACKAGE_NAME                "${PACKAGE_NAME}")
@@ -754,7 +754,7 @@ set(CPACK_PACKAGE_VERSION_PATCH       "${TFEL_VERSION_PATCH}")
 set(CPACK_PACKAGE_VERSION_MAJOR       "${TFEL_VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR       "${TFEL_VERSION_MINOR}")
 set(CPACK_PACKAGE_VENDOR              "CEA_EDF")
-set(CPACK_SOURCE_IGNORE_FILES         "build;/\\\\.svn/;.*~")
+set(CPACK_SOURCE_IGNORE_FILES         "build;/\.git/;.*~")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "TFEL is a numerical library.")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENCE-GNU-GPL")
@@ -785,17 +785,13 @@ set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
       SetRegView  64
       DeleteRegKey HKCR 'TFELHOME-${TFEL_VERSION}'")
 
-# if(UNIX)
-#   add_custom_target(dist-bzip2
-#     COMMAND svn export svn://localhost/PLEIADES/SVN/TFEL/trunk 
-#     ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}-${VERSION}
-#     COMMAND tar -cvjf ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}-${VERSION}.tar.bz2 
-#     ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}-${VERSION}
-#     COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}-${VERSION}
-#     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-# endif(UNIX)
-
 set(CPACK_BUNDLE_NAME "TFEL/MFront")
 
+# source packaging
+set(CPACK_VERBATIM_VARIABLES YES)
+if(NOT CPACK_SOURCE_GENERATOR)
+  set(CPACK_SOURCE_GENERATOR "TGZ")
+endif()
+
 # packaging
 include(CPack)