...
 
Commits (3)
......@@ -29,9 +29,6 @@ find_path(LibAStyle_INCLUDE_DIR
# astyle is built without RTTI
set(LibAStyle_CFLAGS "-fno-rtti")
# fallback in case the version is not detected later on
set(_libastyle_version "0")
if(LibAStyle_LIBRARIES AND LibAStyle_INCLUDE_DIR)
include(CMakePushCheckState)
include(CheckCXXSourceCompiles)
......@@ -48,11 +45,11 @@ int main()
}" LIBASTYLE_HAS_ASPEEKSTREAM)
if(LIBASTYLE_HAS_ASPEEKSTREAM)
set(_libastyle_version "3.1")
endif()
cmake_pop_check_state()
if(NOT (_libastyle_version STREQUAL "0"))
message(STATUS "LibAStyle version autodetected as ${_libastyle_version} or greater")
else()
set(_libastyle_version "0")
endif()
cmake_pop_check_state()
endif()
include(FindPackageHandleStandardArgs)
......
......@@ -58,7 +58,7 @@ ki18n_wrap_ui(debuggercommon_SRCS
# which doesn't set CMP0063 so old behavior is used.
# If kdevdebuggercommon honors visibility properties (set to hidden), it will cause
# linker warnings about direct access to global weak symbol when link against test_gdb
if(NOT CMAKE_VERSION VERSION_LESS "3.3")
if(POLICY CMP0063)
cmake_policy(SET CMP0063 OLD)
endif()
......
......@@ -42,7 +42,7 @@ _kdevelop_completions()
local IFS=$'\n'
CANDIDATES=(
$(compgen -W \
"$(kdevelop --list-sessions 2>/dev/null | egrep '^{' | cut -f2 | sed 's/\s*\[running\]//' | sed 's/\(.*\):.*/\1/' | sed 's/ /\\ /g')" \
"$(kdevelop --list-sessions 2>/dev/null | egrep '^{' | cut -f2 | sed 's/\s*\[running\]//;s/\(.*\):.*/\1/;s/ /\\ /g')" \
-- "${cur}"
)
)
......