Fixes for cmake conversion.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

ConfigureChecks.cmake

@@ -29,3 +29,4 @@ endif( WITH_GCC_VISIBILITY )
 ##### check for yacc (bison)
 
 find_program( BISON_EXECUTABLE bison )
+find_program( FLEX_EXECUTABLE NAMES flex lex )

src/CMakeLists.txt

@@ -11,18 +11,34 @@ link_directories(
   ${TQT_LIBRARY_DIRS}
 )
 
-set( _basename dotparse )
+tde_import( kate )
 
 add_custom_command(
-    OUTPUT  ${_basename}.cpp ${_basename}.hpp
+    OUTPUT  dotparse.cpp dotparse.hpp
     COMMAND ${BISON_EXECUTABLE}
-    ARGS -y --output ${_basename}.cpp --defines=${_basename}.hpp ${CMAKE_CURRENT_SOURCE_DIR}/${_basename}.ypp
+    ARGS -y --output dotparse.cpp --defines=dotparse.hpp ${CMAKE_CURRENT_SOURCE_DIR}/dotparse.ypp
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_basename}.ypp
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dotparse.ypp
 )
 
 add_custom_target(
-    ${_basename}.output
+    dotparse.bison
-    DEPENDS ${_basename}.cpp ${_basename}.hpp
+    DEPENDS
+        ${CMAKE_CURRENT_BINARY_DIR}/dotparse.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/dotparse.hpp
+)
+
+add_custom_command(
+    OUTPUT  dotscan.cc
+    COMMAND ${FLEX_EXECUTABLE}
+    ARGS ${CMAKE_CURRENT_SOURCE_DIR}/dotscan.lpp
+    COMMAND ${CMAKE_COMMAND}
+    ARGS -E rename lex.yy.c dotscan.cc
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dotscan.lpp
+)
+
+add_custom_target(
+    dotscan.lex
+    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/dotscan.cc
 )
 
 ##### kscope (executable)
@@ -45,7 +61,7 @@ tde_add_executable( kscope AUTOMOC
         cscopefrontend.cpp cscopemsgdlg.cpp
         ctagsfrontend.cpp ctagslist.cpp
         dirscanner.cpp dotfrontend.cpp
-        dotscan.lpp editormanager.cpp
+        editormanager.cpp
         editorpage.cpp editortabs.cpp
         encoder.cpp filelist.cpp
         fileview.cpp frontend.cpp
@@ -68,16 +84,18 @@ tde_add_executable( kscope AUTOMOC
         searchlist.cpp searchresultsdlg.cpp
         symbolcompletion.cpp symboldlg.cpp
         tabwidget.cpp treewidget.cpp
-        ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/dotparse.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/dotscan.cc
   LINK
      tdeui-shared
      tdeio-shared
      tdecore-shared
      tdeparts-shared
-     kateinterfaces
+     kateinterfaces-shared
      katepartinterfaces-shared
 
   DESTINATION ${BIN_INSTALL_DIR}
+  DEPENDENCIES dotparse.bison dotscan.lex
 )
 
 

src/makelayout.ui

@@ -239,6 +239,6 @@
 	<include location="global" impldecl="in implementation">klineedit.h</include>
 	<include location="global" impldecl="in implementation">kurlrequester.h</include>
 	<include location="global" impldecl="in implementation">ktextbrowser.h</include>
-	<include location="global" impldecl="in implementation">queryview.h</include>
+	<include location="local" impldecl="in implementation">queryview.h</include>
 </includes>
 </UI>