From 070194309ffdb7f11dc70bb918e9aeee3aa3db44 2017-06-27 13:54:01 From: mperrinel Date: 2017-06-27 13:54:01 Subject: [PATCH] Correction on package.cmake to include COPYING file instead of LICENCE File. Remove message from cmake --- diff --git a/cmake/sciqlop_package.cmake b/cmake/sciqlop_package.cmake index 4337a56..3067f34 100644 --- a/cmake/sciqlop_package.cmake +++ b/cmake/sciqlop_package.cmake @@ -26,11 +26,11 @@ SET (CPACK_PACKAGE_VERSION_MAJOR "${SCIQLOP_VERSION_MAJOR}") SET (CPACK_PACKAGE_VERSION_MINOR "${SCIQLOP_VERSION_MINOR}") SET (CPACK_PACKAGE_VERSION_PATCH "${SCIQLOP_VERSION_PATCH}${SCIQLOP_VERSION_SUFFIX}") SET (CPACK_PACKAGE_VERSION "${SCIQLOP_VERSION}") -SET (CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE) +SET (CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/COPYING) SET (CPACK_PACKAGE_CONTACT "nicolas.aunai@lpp.polytechnique.fr") SET(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/README.md) # SET(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_CURRENT_SOURCE_DIR}/WARN.txt) -SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE) +SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/COPYING) # SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${PROJECT_NAME}-${PROJECT_VERSION}) SET(FULLBUILD ON) diff --git a/formatting/cmake/use_clangformat.cmake b/formatting/cmake/use_clangformat.cmake index 8daefc7..ce4bc89 100644 --- a/formatting/cmake/use_clangformat.cmake +++ b/formatting/cmake/use_clangformat.cmake @@ -91,7 +91,6 @@ FUNCTION(ADD_CLANGFORMAT_TARGETS) ENDFOREACH(item ${globs}) LIST(REMOVE_ITEM srcs ${UIS}) - message("format lang: ${srcs}" ) FOREACH (s ${srcs}) SET(touchedFile ${formatDirectory}/format_touchedfile_${reportNb}) IF(addToAll)