@@ -30,12 +30,17 @@ endif()
30
30
project (cppdlr VERSION 1.0.0 LANGUAGES C CXX)
31
31
get_directory_property (IS_SUBPROJECT PARENT_DIRECTORY )
32
32
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
+ )
35
40
message (STATUS "${PROJECT_NAME} version : ${PROJECT_VERSION} " )
36
41
message (STATUS "${PROJECT_NAME} Git hash: ${PROJECT_GIT_HASH} " )
37
42
38
- # Assert that Install directory is given and invalid .
43
+ # Assert that install directory is provided and is absolute path .
39
44
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR (NOT IS_ABSOLUTE ${CMAKE_INSTALL_PREFIX} ))
40
45
message (FATAL_ERROR "No install prefix given (or invalid)" )
41
46
endif ()
@@ -115,7 +120,7 @@ target_compile_options(${PROJECT_NAME}_warnings
115
120
# FIXME For future cmake versions we should populate the
116
121
# INTERFACE_LINK_DIRECTORIES of the triqs target
117
122
# ---------------------------------
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 })
119
124
string (REPLACE ":" ";" LINK_DIRS $ENV{LIBRARY_PATH} )
120
125
foreach (dir ${LINK_DIRS} )
121
126
string (APPEND CMAKE_SHARED_LINKER_FLAGS " -L${dir} " )
@@ -124,6 +129,9 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND DEFINED ENV{LIBRARY_PATH})
124
129
endforeach ()
125
130
endif ()
126
131
132
+ # Provide GNU Installation directories
133
+ include (GNUInstallDirs)
134
+
127
135
# #############
128
136
# Build Project
129
137
0 commit comments