From 36ffb0f8cf9c1c3b6052aebb96714d4bee2fc55b Mon Sep 17 00:00:00 2001 From: Přemysl Janouch Date: Sun, 18 Jan 2015 22:47:00 +0100 Subject: Bump CMake to 2.8 for no obvious reason And fix FindGtkDoc.cmake with CMake 3. --- cmake/FindGtkDoc.cmake | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'cmake') diff --git a/cmake/FindGtkDoc.cmake b/cmake/FindGtkDoc.cmake index 8df78c1..d7d3dca 100644 --- a/cmake/FindGtkDoc.cmake +++ b/cmake/FindGtkDoc.cmake @@ -221,15 +221,13 @@ function (GTK_DOC_RUN) get_filename_component (_lib_dir ${_lib} PATH) get_filename_component (_lib_name ${_lib} NAME) - # If it's not a target, suppose it's a shared library - get_target_property (_target_type ${_lib_name} TYPE) - if (_target_type) + if (TARGET ${_lib_name}) get_target_property (_lib_output_name ${_lib_name} OUTPUT_NAME) if (_lib_output_name) set (_lib_name ${_lib_output_name}) endif (_lib_output_name) list (APPEND _lib_depends ${_lib_name}) - else (_target_type) + else (TARGET ${_lib_name}) list (FIND _lib_dir_used "${_lib_dir}" _lib_dir_found) if (_lib_dir AND _lib_dir_found EQUAL "-1") set (_ldflags "${_ldflags} -L${_lib_dir}") @@ -240,7 +238,7 @@ function (GTK_DOC_RUN) _lib_name "${_lib_name}") string (REGEX REPLACE "${CMAKE_SHARED_LIBRARY_SUFFIX}\$" "" _lib_name "${_lib_name}") - endif (_target_type) + endif (TARGET ${_lib_name}) set (_ldflags "${_ldflags} -l${_lib_name}") endforeach (_lib) -- cgit v1.2.3-70-g09d2