GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r100:e9600607c0d7

Add dependencies between target to avoid bug compilation when building...

perrinel -

r100:e9600607c0d7

parent child

Context file:

r100:e9600607c0d7

app/CMakeLists.txt +5 0

             ## sciqlop - CMakeLists.txt
             SET(EXECUTABLE_NAME "sciqlop")
             SCIQLOP_SET_TO_PARENT_SCOPE(EXECUTABLE_NAME)
             SET(SOURCES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/)
             SET(INCLUDES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
             SET(UI_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/ui)
             SET(RES_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/resources)
             # Include gui directory
             include_directories("${INCLUDES_DIR}")
             #
             # Find Qt modules
             #
             SCIQLOP_FIND_QT(Core Widgets)
             #
             # Find dependent libraries
             # ========================
             find_package(sciqlop-gui)
             SET(LIBRARIES ${SCIQLOP-GUI_LIBRARIES})
             SET(EXTERN_SHARED_LIBRARIES)
             INCLUDE_DIRECTORIES(${SCIQLOP-GUI_INCLUDE_DIR})
             # Add sqpcore to the list of libraries to use
             list(APPEND LIBRARIES ${SQPCORE_LIBRARY_NAME})
             # Include core directory
             include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../core/include")
             # Add dependent shared libraries
             list(APPEND SHARED_LIBRARIES ${SQPCORE_SHARED_LIBRARIES})
             # Retrieve the location of the dynamic library to copy it to the output path
             #get_property(sqpcoreLocation TARGET ${SQPCORE_LIBRARY_NAME} PROPERTY LOCATION)
             list(APPEND SHARED_LIBRARIES_FROM_TARGETS ${sqpcoreLocation})
             # Ui files
             FILE (GLOB_RECURSE PROJECT_FORMS ${UI_FOLDER}/*.ui)
             #
             # Compile the application
             #
             FILE (GLOB_RECURSE APPLICATION_SOURCES
                 ${INCLUDES_DIR}/*.h
                 ${SOURCES_DIR}/*.c
                 ${SOURCES_DIR}/*.cpp
                 ${SOURCES_DIR}/*.h
                 ${PROJECT_FORMS})
             FILE (GLOB_RECURSE APPLICATION_RESOURCES ${RES_FOLDER}/*.qrc)
             QT5_ADD_RESOURCES(RCC_HDRS ${APPLICATION_RESOURCES} )
             QT5_WRAP_UI(UIS_HDRS
              ${PROJECT_FORMS}
             )
             ADD_EXECUTABLE(${EXECUTABLE_NAME} ${APPLICATION_SOURCES} ${RCC_HDRS} ${UIS_HDRS})
             set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD 14)
             set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
             target_link_libraries(${EXECUTABLE_NAME}
                 ${LIBRARIES})
             # Link with Qt5 modules
             qt5_use_modules(${EXECUTABLE_NAME} Core Widgets)
+            add_dependencies(${EXECUTABLE_NAME} ${SQPGUI_LIBRARY_NAME} ${SQPCORE_LIBRARY_NAME})
             # Add the files to the list of files to be analyzed
             LIST(APPEND CHECKSTYLE_INPUT_FILES ${APPLICATION_SOURCES})
             SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_INPUT_FILES)
             # Vera++ exclusion files
             LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/vera-exclusions/exclusions.txt)
             SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES)
             #
             # Compile the tests
             #
             IF(BUILD_TESTS)
             	INCLUDE_DIRECTORIES(${SOURCES_DIR})
             	FILE (GLOB_RECURSE TESTS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Test*.cpp)
             	FILE (GLOB_RECURSE TESTS_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/Test*.h)
                     SET( TEST_LIBRARIES ${LIBRARIES})
             	FOREACH( testFile ${TESTS_SOURCES} )
             		GET_FILENAME_COMPONENT( testDirectory ${testFile} DIRECTORY )
                             GET_FILENAME_COMPONENT( testName ${testFile} NAME_WE )
             		# Add to the list of sources files all the sources in the same
             		# directory that aren't another test
             		FILE (GLOB currentTestSources
             			${testDirectory}/*.c
             			${testDirectory}/*.cpp
             			${testDirectory}/*.h)
             		LIST (REMOVE_ITEM currentTestSources ${TESTS_SOURCES})
             		LIST (REMOVE_ITEM currentTestSources ${TESTS_HEADERS})
             		ADD_EXECUTABLE(${testName} ${testFile} ${currentTestSources})
                             TARGET_LINK_LIBRARIES( ${testName} ${TEST_LIBRARIES})
             		qt5_use_modules(${testName} Test)
             		ADD_TEST( NAME ${testName} COMMAND ${testName} )
                             SCIQLOP_COPY_TO_TARGET(RUNTIME ${testName})
             	ENDFOREACH( testFile )
             	LIST(APPEND testFilesToFormat ${TESTS_SOURCES})
             	LIST(APPEND testFilesToFormat ${TESTS_HEADERS})
             	LIST(APPEND FORMATTING_INPUT_FILES ${testFilesToFormat})
                     SCIQLOP_SET_TO_PARENT_SCOPE(FORMATTING_INPUT_FILES)
             ENDIF(BUILD_TESTS)
             #
             # Set the files that must be formatted by clang-format.
             #
             LIST (APPEND FORMATTING_INPUT_FILES ${APPLICATION_SOURCES})
             SCIQLOP_SET_TO_PARENT_SCOPE(FORMATTING_INPUT_FILES)
             #
             # Set the directories that doxygen must browse to generate the
             # documentation.
             #
             # Source directories:
             LIST (APPEND DOXYGEN_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/docs")
             LIST (APPEND DOXYGEN_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")
             SCIQLOP_SET_TO_PARENT_SCOPE(DOXYGEN_INPUT_DIRS)
             # Source directories to exclude from the documentation generation
             #LIST (APPEND DOXYGEN_EXCLUDE_PATTERNS "${CMAKE_CURRENT_SOURCE_DIR}/path/to/subdir/*")
             SCIQLOP_SET_TO_PARENT_SCOPE(DOXYGEN_EXCLUDE_PATTERNS)
             #
             # Set the directories with the sources to analyze and propagate the
             # modification to the parent scope
             #
             # Source directories to analyze:
             LIST (APPEND ANALYSIS_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")
             LIST (APPEND ANALYSIS_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/tests")
             SCIQLOP_SET_TO_PARENT_SCOPE(ANALYSIS_INPUT_DIRS)
             # Source directories to exclude from the analysis
             #LIST (APPEND ANALYSIS_EXCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/path/to/subdir")
             SCIQLOP_SET_TO_PARENT_SCOPE(ANALYSIS_EXCLUDE_DIRS)

cmake/sciqlop_package.cmake 0 -1

             #
             # 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_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_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})
-            message("exepath" ${CPACK_PACKAGE_INSTALL_DIRECTORY})
             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)

gui/CMakeLists.txt +3 0

             ## gui - CMakeLists.txt
             STRING(TOLOWER ${CMAKE_PROJECT_NAME} LIBRARY_PREFFIX)
             SET(SQPGUI_LIBRARY_NAME "${LIBRARY_PREFFIX}_gui${DEBUG_SUFFIX}")
             SET(SOURCES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
             SET(INCLUDES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
             SET(UI_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/ui")
             SET(RES_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/resources")
             # Include gui directory
             include_directories("${INCLUDES_DIR}")
             include_directories("${CMAKE_CURRENT_BINARY_DIR}")
             # Set a variable to display a warning in the version files.
             SET(SCIQLOP_CMAKE_GENERATION_WARNING "DON'T CHANGE THIS FILE. AUTOGENERATED BY CMAKE.")
             #
             # Find Qt modules
             #
             SCIQLOP_FIND_QT(Core Widgets PrintSupport)
             #
             # Find dependent libraries
             # ========================
             find_package(sciqlop-core)
             SET(LIBRARIES ${SCIQLOP-CORE_LIBRARIES})
             INCLUDE_DIRECTORIES(${SCIQLOP-CORE_INCLUDE_DIR})
             # Add sqpcore to the list of libraries to use
             list(APPEND LIBRARIES ${SQPCORE_LIBRARY_NAME})
             # Add dependent shared libraries
             list(APPEND SHARED_LIBRARIES ${SQPCORE_SHARED_LIBRARIES})
             # Ui files
             FILE (GLOB_RECURSE PROJECT_FORMS ${UI_FOLDER}/*.ui)
             # Resources files
             FILE (GLOB_RECURSE PROJECT_RESOURCES ${RES_FOLDER}/*.qrc)
             #
             # Compile the library library
             #
             FILE (GLOB_RECURSE MODULE_SOURCES
                     ${INCLUDES_DIR}/*.h
                     ${SOURCES_DIR}/*.c
                     ${SOURCES_DIR}/*.cpp
                     ${SOURCES_DIR}/*.h
                     ${PROJECT_FORMS})
             QT5_ADD_RESOURCES(RCC_HDRS
               ${PROJECT_RESOURCES}
             )
             QT5_WRAP_UI(UIS_HDRS
              ${PROJECT_FORMS}
             )
             ADD_LIBRARY(${SQPGUI_LIBRARY_NAME} ${MODULE_SOURCES} ${UIS_HDRS} ${RCC_HDRS})
             set_property(TARGET ${SQPGUI_LIBRARY_NAME} PROPERTY CXX_STANDARD 14)
             set_property(TARGET ${SQPGUI_LIBRARY_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
             TARGET_LINK_LIBRARIES(${SQPGUI_LIBRARY_NAME} ${LIBRARIES})
             qt5_use_modules(${SQPGUI_LIBRARY_NAME} Core Widgets PrintSupport)
+            add_dependencies(${SQPGUI_LIBRARY_NAME} ${SQPCORE_LIBRARY_NAME})
             # From cmake documentation: http://www.cmake.org/cmake/help/v3.0/manual/cmake-buildsystem.7.html
             # Entries in the COMPILE_DEFINITIONS are prefixed with -D or /D and added to the compile line in an unspecified order.
             # The DEFINE_SYMBOL target property is also added as a compile definition as a special convenience case for SHARED and MODULE library targets
             IF(BUILD_SHARED_LIBS)
                     SET_TARGET_PROPERTIES(${SQPGUI_LIBRARY_NAME} PROPERTIES COMPILE_DEFINITIONS "SCIQLOP_EXPORT")
             ELSE()
                     TARGET_COMPILE_DEFINITIONS(${SQPGUI_LIBRARY_NAME} PUBLIC "SCIQLOP_STATIC_LIBRARIES")
             ENDIF()
             # Set the variable to parent scope so that the other projects can copy the
             # dependent shared libraries
             SCIQLOP_SET_TO_PARENT_SCOPE(SQPGUI_LIBRARY_NAME)
             # Copy extern shared libraries to the lib folder
             SCIQLOP_COPY_TO_TARGET(LIBRARY ${SQPGUI_LIBRARY_NAME})
             # Add the files to the list of files to be analyzed
             LIST(APPEND CHECKSTYLE_INPUT_FILES ${MODULE_SOURCES})
             SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_INPUT_FILES)
             # Vera++ exclusion files
             LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/vera-exclusions/exclusions.txt)
             SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES)
             #
             # Compile the tests
             #
             IF(BUILD_TESTS)
                     INCLUDE_DIRECTORIES(${SOURCES_DIR})
                     FILE (GLOB_RECURSE TESTS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Test*.cpp)
                     FILE (GLOB_RECURSE TESTS_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/Test*.h)
                     SET( TEST_LIBRARIES ${SQPGUI_LIBRARY_NAME})
                     FOREACH( testFile ${TESTS_SOURCES} )
                             GET_FILENAME_COMPONENT( testDirectory ${testFile} DIRECTORY )
                             GET_FILENAME_COMPONENT( testName ${testFile} NAME_WE )
                             # Add to the list of sources files all the sources in the same
                             # directory that aren't another test
                             FILE (GLOB currentTestSources
                                     ${testDirectory}/*.c
                                     ${testDirectory}/*.cpp
                                     ${testDirectory}/*.h)
                             LIST (REMOVE_ITEM currentTestSources ${TESTS_SOURCES})
                             # LIST (REMOVE_ITEM currentTestSources ${TESTS_HEADERS})
                             ADD_EXECUTABLE(${testName} ${testFile} ${currentTestSources})
                             set_property(TARGET ${testName} PROPERTY CXX_STANDARD 14)
                             set_property(TARGET ${testName} PROPERTY CXX_STANDARD_REQUIRED ON)
                             TARGET_LINK_LIBRARIES( ${testName} ${TEST_LIBRARIES} )
                             qt5_use_modules(${testName} Test)
                             ADD_TEST( NAME ${testName} COMMAND ${testName} )
                             SCIQLOP_COPY_TO_TARGET(RUNTIME ${testName} ${EXTERN_SHARED_LIBRARIES})
                     ENDFOREACH( testFile )
                     LIST(APPEND testFilesToFormat ${TESTS_SOURCES})
                     LIST(APPEND testFilesToFormat ${TESTS_HEADERS})
                     LIST(APPEND FORMATTING_INPUT_FILES ${testFilesToFormat})
                     SCIQLOP_SET_TO_PARENT_SCOPE(FORMATTING_INPUT_FILES)
             ENDIF(BUILD_TESTS)
             #
             # Set the files that must be formatted by clang-format.
             #
             LIST (APPEND FORMATTING_INPUT_FILES ${MODULE_SOURCES})
             SCIQLOP_SET_TO_PARENT_SCOPE(FORMATTING_INPUT_FILES)
             #
             # Set the directories that doxygen must browse to generate the
             # documentation.
             #
             # Source directories:
             LIST (APPEND DOXYGEN_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/docs")
             LIST (APPEND DOXYGEN_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")
             SCIQLOP_SET_TO_PARENT_SCOPE(DOXYGEN_INPUT_DIRS)
             # Source directories to exclude from the documentation generation
             #LIST (APPEND DOXYGEN_EXCLUDE_PATTERNS "${CMAKE_CURRENT_SOURCE_DIR}/path/to/subdir/*")
             SCIQLOP_SET_TO_PARENT_SCOPE(DOXYGEN_EXCLUDE_PATTERNS)
             #
             # Set the directories with the sources to analyze and propagate the
             # modification to the parent scope
             #
             # Source directories to analyze:
             LIST (APPEND ANALYSIS_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")
             LIST (APPEND ANALYSIS_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/tests")
             SCIQLOP_SET_TO_PARENT_SCOPE(ANALYSIS_INPUT_DIRS)
             # Source directories to exclude from the analysis
             #LIST (APPEND ANALYSIS_EXCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/path/to/subdir")
             SCIQLOP_SET_TO_PARENT_SCOPE(ANALYSIS_EXCLUDE_DIRS)

General Comments 2

perrinel

|

Auto status change to "Under Review"

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