commit 9c9ce42f16b311175630b1a1eee89c880e982b7f parent 8496abae79ba96fbe56219382122da2288fb0444 Author: vaplv <vaplv@free.fr> Date: Thu, 19 Apr 2018 12:02:53 +0200 Minor update of the formatting of CMakeLists.txt Diffstat:
| M | cmake/CMakeLists.txt | | | 20 | +++++++++++++------- |
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt @@ -150,16 +150,22 @@ if(CMAKE_COMPILER_IS_GNUCC) # the clock_gettime function. find_library(_GLIBC NAMES glib-2.0) get_filename_component(_GLIB_LIBRARY_DIR ${_GLIBC} PATH) - find_path(_GLIBCONFIG_INCLUDE_DIR NAMES glibconfig.h + find_path(_GLIBCONFIG_INCLUDE_DIR NAMES glibconfig.h HINTS ${_GLIB_LIBRARY_DIR} PATH_SUFFIXES glib-2.0/include) if(_GLIBCONFIG_INCLUDE_DIR) - file(STRINGS "${_GLIBCONFIG_INCLUDE_DIR}/glibconfig.h" _GLIB_MAJOR_LINE REGEX "^#define[ \t]+GLIB_MAJOR_VERSION[ \t]+[0-9]+$") - file(STRINGS "${_GLIBCONFIG_INCLUDE_DIR}/glibconfig.h" _GLIB_MINOR_LINE REGEX "^#define[ \t]+GLIB_MINOR_VERSION[ \t]+[0-9]+$") - file(STRINGS "${_GLIBCONFIG_INCLUDE_DIR}/glibconfig.h" _GLIB_PATCH_LINE REGEX "^#define[ \t]+GLIB_MICRO_VERSION[ \t]+[0-9]+$") - string(REGEX REPLACE "^#define[ \t]+GLIB_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" _GLIB_MAJOR "${_GLIB_MAJOR_LINE}") - string(REGEX REPLACE "^#define[ \t]+GLIB_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" _GLIB_MINOR "${_GLIB_MINOR_LINE}") - string(REGEX REPLACE "^#define[ \t]+GLIB_MICRO_VERSION[ \t]+([0-9]+)$" "\\1" _GLIB_PATCH "${_GLIB_PATCH_LINE}") + file(STRINGS "${_GLIBCONFIG_INCLUDE_DIR}/glibconfig.h" + _GLIB_MAJOR_LINE REGEX "^#define[ \t]+GLIB_MAJOR_VERSION[ \t]+[0-9]+$") + file(STRINGS "${_GLIBCONFIG_INCLUDE_DIR}/glibconfig.h" + _GLIB_MINOR_LINE REGEX "^#define[ \t]+GLIB_MINOR_VERSION[ \t]+[0-9]+$") + file(STRINGS "${_GLIBCONFIG_INCLUDE_DIR}/glibconfig.h" + _GLIB_PATCH_LINE REGEX "^#define[ \t]+GLIB_MICRO_VERSION[ \t]+[0-9]+$") + string(REGEX REPLACE "^#define[ \t]+GLIB_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" + _GLIB_MAJOR "${_GLIB_MAJOR_LINE}") + string(REGEX REPLACE "^#define[ \t]+GLIB_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" + _GLIB_MINOR "${_GLIB_MINOR_LINE}") + string(REGEX REPLACE "^#define[ \t]+GLIB_MICRO_VERSION[ \t]+([0-9]+)$" "\\1" + _GLIB_PATCH "${_GLIB_PATCH_LINE}") set(_GLIB_VERSION "${_GLIB_MAJOR}.${_GLIB_MINOR}.${_GLIB_PATCH}") if("${_GLIBC_VERSION}" VERSION_LESS "2.17") target_link_libraries(rsys rt)