Compare commits

...

4 Commits

Author SHA1 Message Date
Dennis Klein
af288551aa Export the correct include path 2018-04-18 00:01:26 +02:00
Dennis Klein
8f68cef9e3 Enable C language to get rid of a warning in alfa-ci
This should rather be solved in the build environment, which is work on
the todo list.
2018-04-12 21:36:05 +02:00
Dennis Klein
6d71d22986 Use status messages 2018-04-12 21:10:56 +02:00
Dennis Klein
e72a0409a6 Remove check for share directory which does not exist 2018-04-12 19:53:17 +02:00
3 changed files with 8 additions and 10 deletions

View File

@@ -16,8 +16,8 @@ include(FairLoggerLib)
set_fairlogger_cmake_policies()
get_git_version(OUTVAR_PREFIX FairLogger)
project(FairLogger VERSION ${FairLogger_VERSION} LANGUAGES CXX)
message("${BWhite}${PROJECT_NAME}${CR} ${FairLogger_GIT_VERSION} from ${FairLogger_DATE}")
project(FairLogger VERSION ${FairLogger_VERSION} LANGUAGES C CXX)
message(STATUS "${BWhite}${PROJECT_NAME}${CR} ${FairLogger_GIT_VERSION} from ${FairLogger_DATE}")
set_fairlogger_defaults()
@@ -84,14 +84,14 @@ endif()
# Summary ######################################################################
message(" ")
message(" ${Cyan}COMPONENT BUILT? INFO${CR}")
message(" ${BWhite}library${CR} ${BGreen}YES${CR} (default, always built)")
message(STATUS " ")
message(STATUS " ${Cyan}COMPONENT BUILT? INFO${CR}")
message(STATUS " ${BWhite}library${CR} ${BGreen}YES${CR} (default, always built)")
if(BUILD_TESTING)
set(testing_summary "${BGreen}YES${CR} (default, disable with ${BMagenta}-DBUILD_TESTING=OFF${CR})")
else()
set(testing_summary "${BRed} NO${CR} (enable with ${BMagenta}-DBUILD_TESTING=ON${CR})")
endif()
message(" ${BWhite}tests${CR} ${testing_summary}")
message(" ")
message(STATUS " ${BWhite}tests${CR} ${testing_summary}")
message(STATUS " ")
################################################################################

View File

@@ -16,9 +16,8 @@ set(FairLogger_GIT_VERSION @FairLogger_GIT_VERSION@)
set_and_check(FairLogger_ROOT @PACKAGE_CMAKE_INSTALL_PREFIX@)
set_and_check(FairLogger_BINDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@FairLogger_INSTALL_BINDIR@)
set_and_check(FairLogger_INCDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@FairLogger_INSTALL_INCDIR@)
set_and_check(FairLogger_INCDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@)
set_and_check(FairLogger_LIBDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@FairLogger_INSTALL_LIBDIR@)
set_and_check(FairLogger_DATADIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@FairLogger_INSTALL_DATADIR@)
### Import targets
include(@PACKAGE_CMAKE_INSTALL_PREFIX@/@PACKAGE_INSTALL_DESTINATION@/FairLoggerTargets.cmake)

View File

@@ -10,7 +10,6 @@
#define FAIRLOGGER_VERSION "@PROJECT_VERSION@"
#define FAIRLOGGER_VERSION_DEC (@PROJECT_VERSION_MAJOR@ * 10000) + (@PROJECT_VERSION_MINOR@ * 100) + @PROJECT_VERSION_PATCH@
#define FAIRLOGGER_VERSION_HEX (@PROJECT_VERSION_MAJOR@ << 16) + (@PROJECT_VERSION_MINOR@ << 8) + @PROJECT_VERSION_PATCH@
#define FAIRLOGGER_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
#define FAIRLOGGER_VERSION_MINOR @PROJECT_VERSION_MINOR@
#define FAIRLOGGER_VERSION_PATCH @PROJECT_VERSION_PATCH@