Skip to content

Commit f7b1006

Browse files
committed
[cmake] Update top-level CMakeLists.txt file with latest app4triqs skeleton
1 parent d12a198 commit f7b1006

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

CMakeLists.txt

+12-4
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,17 @@ endif()
3030
project(cppdlr VERSION 1.0.0 LANGUAGES C CXX)
3131
get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY)
3232

33-
# Get the git hash & print status
34-
execute_process(COMMAND git rev-parse HEAD WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE PROJECT_GIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE)
33+
message(STATUS "-------- cppdlr version and git hash detection -------------")
34+
find_package(Git)
35+
execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
36+
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
37+
OUTPUT_VARIABLE PROJECT_GIT_HASH
38+
OUTPUT_STRIP_TRAILING_WHITESPACE
39+
)
3540
message(STATUS "${PROJECT_NAME} version : ${PROJECT_VERSION}")
3641
message(STATUS "${PROJECT_NAME} Git hash: ${PROJECT_GIT_HASH}")
3742

38-
# Assert that Install directory is given and invalid.
43+
# Assert that install directory is provided and is absolute path.
3944
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR (NOT IS_ABSOLUTE ${CMAKE_INSTALL_PREFIX}))
4045
message(FATAL_ERROR "No install prefix given (or invalid)")
4146
endif()
@@ -115,7 +120,7 @@ target_compile_options(${PROJECT_NAME}_warnings
115120
# FIXME For future cmake versions we should populate the
116121
# INTERFACE_LINK_DIRECTORIES of the triqs target
117122
# ---------------------------------
118-
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND DEFINED ENV{LIBRARY_PATH})
123+
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND DEFINED ENV{LIBRARY_PATH})
119124
string(REPLACE ":" ";" LINK_DIRS $ENV{LIBRARY_PATH})
120125
foreach(dir ${LINK_DIRS})
121126
string(APPEND CMAKE_SHARED_LINKER_FLAGS " -L${dir}")
@@ -124,6 +129,9 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND DEFINED ENV{LIBRARY_PATH})
124129
endforeach()
125130
endif()
126131

132+
# Provide GNU Installation directories
133+
include(GNUInstallDirs)
134+
127135
# #############
128136
# Build Project
129137

0 commit comments

Comments
 (0)