From a8f54b53d5e51cd67cc6befdcdec869185d79d04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Del=20Pino?= <stephane.delpino44@gmail.com> Date: Mon, 19 Mar 2018 09:02:21 +0100 Subject: [PATCH] comsmetic clean-up --- CMakeLists.txt | 12 ++++++++++-- utils/CMakeLists.txt | 21 ++++++++++++++++++--- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 53c681cdb..77b791c43 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,14 @@ include_directories(utils) include(GetKokkosCompilerFlags) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") +# ------------------- Source files -------------------- # Pastis binary -add_executable(pastis main.cpp) -target_link_libraries(pastis kokkos PastisUtils) +add_executable( + pastis + main.cpp) + +# Libraries +target_link_libraries( + pastis + kokkos + PastisUtils) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 3311f608c..73cfdd7bd 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -1,6 +1,14 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) +# ------------------- Source files -------------------- + +add_library( + PastisUtils + RevisionInfo.cpp) + +# --------------- get git revision info --------------- + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/cmake-modules") include(GetGitRevisionDescription) @@ -14,6 +22,7 @@ else() set(PASTIS_IS_CLEAN false) endif() +# Generates revision header file add_custom_target( git_revision ALL @@ -28,8 +37,14 @@ set_source_files_properties( configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pastis_git_revision.hpp.in" "${CMAKE_CURRENT_BINARY_DIR}/pastis_git_revision.hpp" @ONLY) -list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/pastis_git_revision.hpp) +list( + APPEND + SOURCES + ${CMAKE_CURRENT_BINARY_DIR}/pastis_git_revision.hpp) + include_directories(${CMAKE_CURRENT_BINARY_DIR}) -add_library(PastisUtils RevisionInfo.cpp) -add_dependencies(PastisUtils git_revision) +# Additional dependencies +add_dependencies( + PastisUtils + git_revision) -- GitLab