HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r242:070194309ffd

Correction on package.cmake to include COPYING file instead of LICENCE File. Remove message from cmake

perrinel -

r242:070194309ffd

parent child

Context file:

r242:070194309ffd

cmake/sciqlop_package.cmake +2 -2

             #
             # Generate the source package of SciqLop.
             #
             install(DIRECTORY
                     ${EXECUTABLE_OUTPUT_PATH}
                     DESTINATION "."
                     USE_SOURCE_PERMISSIONS
                     COMPONENT CORE
                     PATTERN "*.a" EXCLUDE
             )
             set(EXECUTABLEDOTEXTENSION)
             if(WIN32)
                 set(EXECUTABLEDOTEXTENSION ".exe")
             endif(WIN32)
             set (SCIQLOP_EXE_LOCATION ${EXECUTABLE_OUTPUT_PATH}/${EXECUTABLE_NAME}${EXECUTABLEDOTEXTENSION})
             if(WIN32)
                 include ("cmake/sciqlop_package_qt.cmake")
             endif(WIN32)
             SET (CPACK_PACKAGE_VENDOR "CNRS")
             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)
             SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
             SET(CPACK_GENERATOR "NSIS")
             SET(CPACK_MONOLITHIC_INSTALL 1)
             #SET(CPACK_COMPONENTS_ALL sciqlop qt)
             SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Setup")
             SET(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_NAME})
             set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
             if (WIN32)
                SET(CPACK_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
                SET(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
                SET(CPACK_NSIS_COMPONENT_INSTALL ON)
                SET(CPACK_SYSTEM_NAME "MinGW32")
                SET(CPACK_PACKAGING_INSTALL_PREFIX "")
                #SET(CPACK_GENERATOR "NSIS")
                SET(CPACK_NSIS_DISPLAY_NAME ${PROJECT_NAME})
                SET(CPACK_NSIS_MUI_FINISHPAGE_RUN ${SCIQLOP_EXECUTABLE_NAME})
                SET(CPACK_NSIS_MUI_ICON     ${SCIQLOP_EXECUTABLE_ICON_LOCATION})
                SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\${SCIQLOP_EXECUTABLE_NAME}.exe")
             endif (WIN32)
             INCLUDE(CPack)

formatting/cmake/use_clangformat.cmake 0 -1

             #
             # use_clangformat.cmake
             #
             # The following functions are defined in this document:
             #
             # ADD_CLANGFORMAT_TARGETS(<globExpression> ...
             #   [ADD_TO_ALL]
             #   [NAME <name>]
             #   [NAME_ALL <nameall>]
             #   [STYLE style]
             #   [RECURSE])
             #
             # Two custom targets will be created:
             # * format_reports is run as part of the build, and is not rerun unless one of
             # the file formatted is modified (only created if ADD_TO_ALL is provided);
             # * format must be explicitely called (make format) and is rerun even if the
             # files to format have not been modified. To achieve this behavior, the commands
             # used in this target pretend to produce a file without actually producing it.
             # Because the output file is not there after the run, the command will be rerun
             # again at the next target build.
             #
             # If ADD_TO_ALL is provided then a target will be added to the default build
             # targets so that each time a source file is compiled, it is formatted with
             # clang-format.
             #
             # NAME and NAME_ALL customize the name of the targets (format and format_reports
             # by default respectively).
             #
             # STYLE sets the style used by clang-format (default to "file").
             #
             # RECURSE selects if the glob expressions should be applied recursively or not.
             FUNCTION(ADD_CLANGFORMAT_TARGETS)
                 # Default values
                 SET(target "format")
                 SET(target_all "format_all")
                 SET(style "file")
                 SET(recurse OFF)
                 SET(addToAll OFF)
                 SET(globs)
                 # Parse the options
                 MATH(EXPR lastIdx "${ARGC} - 1")
                 SET(i 0)
                 WHILE(i LESS ${ARGC})
                     SET(arg "${ARGV${i}}")
                     IF("${arg}" STREQUAL "ADD_TO_ALL")
                         SET(addToAll ON)
                     ELSEIF("${arg}" STREQUAL "NAME")
                         clangformat_incr(i)
                         SET(target "${ARGV${i}}")
                     ELSEIF("${arg}" STREQUAL "NAME_ALL")
                         clangformat_incr(i)
                         SET(target_all "${ARGV${i}}")
                     ELSEIF("${arg}" STREQUAL "STYLE")
                         clangformat_incr(i)
                         SET(style "${ARGV${i}}")
                     ELSEIF("${arg}" STREQUAL "RECURSE")
                         SET(recurse ON)
                     ELSE()
                         LIST(APPEND globs ${arg})
                     ENDIF()
                     clangformat_incr(i)
                 ENDWHILE()
                 # Retrieve source files to format
                 IF(recurse)
                     FILE(GLOB_RECURSE srcs ${globs})
                 ELSE()
                     FILE(GLOB srcs ${globs})
                 ENDIF()
                 IF(NOT CLANGFORMAT_EXECUTABLE)
                     MESSAGE(FATAL_ERROR "Unable to find clang-format executable")
                 ENDIF()
                 # Format each source file with clang-format
                 SET(touchedFiles)
                 SET(fakedTouchedFiles)
                 SET(reportNb 0)
                 # Create the directory where the touched files will be saved
                 SET(formatDirectory "${CMAKE_CURRENT_BINARY_DIR}/format")
                 FILE(MAKE_DIRECTORY ${formatDirectory})
             #    STRING(REPLACE "*.ui" "" srcs ${srcs})
                 FOREACH(item ${globs})
                   STRING(REGEX MATCH ".*\.ui$" item ${item})
                   IF(item)
                     LIST(APPEND UIS ${item})
                   ENDIF(item)
                 ENDFOREACH(item ${globs})
                 LIST(REMOVE_ITEM srcs ${UIS})
-                message("format lang: ${srcs}" )
                 FOREACH (s ${srcs})
                     SET(touchedFile ${formatDirectory}/format_touchedfile_${reportNb})
                     IF(addToAll)
                         ADD_CUSTOM_COMMAND(
                             OUTPUT ${touchedFile}
                             COMMAND ${CLANGFORMAT_EXECUTABLE}
                                 -style="${style}"
                                 -i
                                 ${s}
                             # Create a file so that this command is executed only if the source
                             # file is modified
                             COMMAND ${CMAKE_COMMAND} -E touch ${touchedFile}
                             DEPENDS ${s}
                             COMMENT "Formatting code with clang-format of ${s}"
                         )
                     ENDIF()
                     SET(fakedTouchedFile ${formatDirectory}/format_fakedtouchedfile_${reportNb})
                     ADD_CUSTOM_COMMAND(
                         OUTPUT ${fakedTouchedFile}
                         COMMAND ${CLANGFORMAT_EXECUTABLE}
                             -style="${style}"
                             -i
                             ${s}
                         DEPENDS ${s}
                         COMMENT "Formatting code with clang-format of ${s}"
                     )
                     LIST(APPEND touchedFiles ${touchedFile})
                     LIST(APPEND fakedTouchedFiles ${fakedTouchedFile})
                     clangformat_incr(reportNb)
                 ENDFOREACH()
                 # Create the custom targets that will trigger the custom command created
                 # previously
                 IF(addToAll)
                     ADD_CUSTOM_TARGET(${target_all} ALL DEPENDS ${touchedFiles})
                 ENDIF()
                 ADD_CUSTOM_TARGET(${target} DEPENDS ${fakedTouchedFiles})
             ENDFUNCTION(ADD_CLANGFORMAT_TARGETS)
             macro(clangformat_incr var_name)
               math(EXPR ${var_name} "${${var_name}} + 1")
             endmacro()

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages