aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt6
-rw-r--r--cmake/FindGtkDoc.cmake8
2 files changed, 6 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 015b326..d50022f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,8 @@
project (logdiag C)
-cmake_minimum_required (VERSION 2.6.2)
+cmake_minimum_required (VERSION 2.8)
-# Default to 2.6.3 behaviour
-cmake_policy (VERSION 2.6.3)
+# Default to 2.8 behaviour
+cmake_policy (VERSION 2.8)
# Options
option (OPTION_USE_VERA "Use vera++ for source code style checks" OFF)
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)