diff --git a/CMakeLists.txt b/CMakeLists.txt index 97a380131d7b4986681a2d0a555d2e397f88f0fa..6b5ca55904ce9a22c0ef946e7a1e330d5010aadc 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,9 +15,8 @@ project(ScalFMM) # ScalFMM version number. An even minor number corresponds to releases. SET(ScalFMM_MAJOR_VERSION 1) SET(ScalFMM_MINOR_VERSION 1) -SET(ScalFMM_BUILD_VERSION 0) -SET(ScalFMM_VERSION "${ScalFMM_MAJOR_VERSION}.${ScalFMM_MINOR_VERSION}.${ScalFMM_BUILD_VERSION}" - ) +SET(ScalFMM_BUILD_VERSION 1) +SET(ScalFMM_VERSION "${ScalFMM_MAJOR_VERSION}.${ScalFMM_MINOR_VERSION}.${ScalFMM_BUILD_VERSION}" ) # # Active language @@ -186,3 +185,21 @@ INSTALL(FILES ${ScalFMM_BINARY_DIR}/ScalFMMConfig.cmake DESTINATION lib/ ) +# +# Add CPACK Module +# ---------------- +# +# build a CPack driven installer package +set (CPACK_RESOURCE_FILE_LICENSE + "${CMAKE_CURRENT_SOURCE_DIR}/Licence.txt") +SET(CPACK_PACKAGE_VERSION_MAJOR "${ScalFMM_MAJOR_VERSION}") +SET(CPACK_PACKAGE_VERSION_NINOR "${ScalFMM_MINOR_VERSION}") +set(CPACK_PACKAGE_VERSION_PATCH "${ScalFMM_BUILD_VERSION}") +SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY "ON") +# +SET(CPACK_SOURCE_GENERATOR "TGZ") +SET(CPACK_SOURCE_PACKAGE_FILE_NAME "ScalFMM-${ScalFMM_VERSION}") +SET(CPACK_SOURCE_IGNORE_FILES "\\\\.git;.DS_Store;.*~;/*.aux;/*.idx;/*.log;/*.out;/*.toc;/*.ilg;/*.ind;scalfmm.pro*") +LIST(APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_BINARY_DIR}") +# +INCLUDE(CPack) \ No newline at end of file diff --git a/ScalFMMConfig.cmake.in b/ScalFMMConfig.cmake.in index d8dd7cd1919e7530dbafc085d0973f066da4d373..31aad13402bf29f41aa1d09b6018e92e1ee1e5df 100644 --- a/ScalFMMConfig.cmake.in +++ b/ScalFMMConfig.cmake.in @@ -25,9 +25,9 @@ SET(ScalFMM_BUILD_TYPE "@CMAKE_BUILD_TYPE@") # # ScalFMM Options # -SET(ScalFMM_USE_MPI "@ScalFMM_USE_MPI@") -SET(ScalFMM_USE_BLAS "@ScaLFMM_USE_BLAS@") -SET(ScalFMM_USE_MKL "@ScalFMM_USE_MKL_AS_BLAS@") +SET(ScalFMM_USE_MPI "@ScalFMM_USE_MPI@") +SET(ScalFMM_USE_BLAS "@ScaLFMM_USE_BLAS@") +SET(ScalFMM_USE_MKL "@ScalFMM_USE_MKL_AS_BLAS@") SET(ScalFMM_USE_DOUBLE_PRECISION "@ScalFMM_USE_DOUBLE_PRECISION@") SET(ScalFMM_USE_MEM_STATS "@ScalFMM_USE_MEM_STATS@") SET(ScalFMM_USE_SSE "@ScalFMM_USE_SSE@")