p
/
logdiag
1
1
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

Bump CMake to 2.8 for no obvious reason 

And fix FindGtkDoc.cmake with CMake 3.
This commit is contained in:
Přemysl Eric Janouch 2015-01-18 22:47:00 +01:00
parent 64a97f54bf
commit 36ffb0f8cf
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -1,8 +1,8 @@
project (logdiag C) project (logdiag C)
cmake_minimum_required (VERSION 2.6.2) cmake_minimum_required (VERSION 2.8)
# Default to 2.6.3 behaviour # Default to 2.8 behaviour
cmake_policy (VERSION 2.6.3) cmake_policy (VERSION 2.8)
# Options # Options
option (OPTION_USE_VERA "Use vera++ for source code style checks" OFF) option (OPTION_USE_VERA "Use vera++ for source code style checks" OFF)

8
cmake/FindGtkDoc.cmake
View File

@ -221,15 +221,13 @@ function (GTK_DOC_RUN)
get_filename_component (_lib_dir ${_lib} PATH) get_filename_component (_lib_dir ${_lib} PATH)
get_filename_component (_lib_name ${_lib} NAME) get_filename_component (_lib_name ${_lib} NAME)
# If it's not a target, suppose it's a shared library if (TARGET ${_lib_name})
get_target_property (_target_type ${_lib_name} TYPE)
if (_target_type)
get_target_property (_lib_output_name ${_lib_name} OUTPUT_NAME) get_target_property (_lib_output_name ${_lib_name} OUTPUT_NAME)
if (_lib_output_name) if (_lib_output_name)
set (_lib_name ${_lib_output_name}) set (_lib_name ${_lib_output_name})
endif (_lib_output_name) endif (_lib_output_name)
list (APPEND _lib_depends ${_lib_name}) list (APPEND _lib_depends ${_lib_name})
else (_target_type) else (TARGET ${_lib_name})
list (FIND _lib_dir_used "${_lib_dir}" _lib_dir_found) list (FIND _lib_dir_used "${_lib_dir}" _lib_dir_found)
if (_lib_dir AND _lib_dir_found EQUAL "-1") if (_lib_dir AND _lib_dir_found EQUAL "-1")
set (_ldflags "${_ldflags} -L${_lib_dir}") set (_ldflags "${_ldflags} -L${_lib_dir}")
@ -240,7 +238,7 @@ function (GTK_DOC_RUN)
_lib_name "${_lib_name}") _lib_name "${_lib_name}")
string (REGEX REPLACE "${CMAKE_SHARED_LIBRARY_SUFFIX}\$" "" string (REGEX REPLACE "${CMAKE_SHARED_LIBRARY_SUFFIX}\$" ""
_lib_name "${_lib_name}") _lib_name "${_lib_name}")
endif (_target_type) endif (TARGET ${_lib_name})
set (_ldflags "${_ldflags} -l${_lib_name}") set (_ldflags "${_ldflags} -l${_lib_name}")
endforeach (_lib) endforeach (_lib)