Conversion to the cmake building system.

Add includes to UI files to resolve FTBFS.

Signed-off-by: gregory guy <g-gregory@gmx.fr>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

6 files changed, 122 insertions, 10 deletions

diff --git a/kbruch/CMakeLists.txt b/kbruch/CMakeLists.txt
new file mode 100644
index 00000000..192ddd69
--- /dev/null
+++ b/kbruch/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_subdirectory( src )
+add_subdirectory( testcases )
+
+
+file( STRINGS "VERSION" _KBRUCH_VERSION )
+file( WRITE ${CMAKE_CURRENT_SOURCE_DIR}/src/version.h
+      "#undef KBRUCH_VERSION\n#define KBRUCH_VERSION \"${_KBRUCH_VERSION}\""
+)
diff --git a/kbruch/src/CMakeLists.txt b/kbruch/src/CMakeLists.txt
new file mode 100644
index 00000000..d37f661c
--- /dev/null
+++ b/kbruch/src/CMakeLists.txt
@@ -0,0 +1,69 @@
+add_subdirectory( svg-source) 
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kbruch (executable)
+
+tde_add_executable( kbruch AUTOMOC
+
+  SOURCES
+        settingsclass.kcfgc
+        taskvieweroptionsbase.ui
+        exercisebase.cpp
+        task.cpp ratio.cpp
+        taskview.cpp
+        statisticsview.cpp
+        primenumber.cpp
+        kbruch.cpp
+        mainqtwidget.cpp
+        taskwidget.cpp
+        fractionbasewidget.cpp
+        resultwidget.cpp
+        exercisecompare.cpp
+        ratiowidget.cpp
+        rationalwidget.cpp
+        exerciseconvert.cpp
+        exercisefactorize.cpp
+        factorizedwidget.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( )
+
+
+##### other data
+
+install(
+    FILES kbruchui.rc
+    DESTINATION ${DATA_INSTALL_DIR}/kbruch
+)
+
+install(
+    FILES kbruch.desktop
+    DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
+
+install(
+    FILES kbruch.kcfg
+    DESTINATION ${KCFG_INSTALL_DIR}
+)
diff --git a/kbruch/src/svg-source/CMakeLists.txt b/kbruch/src/svg-source/CMakeLists.txt
new file mode 100644
index 00000000..dd8e9ff8
--- /dev/null
+++ b/kbruch/src/svg-source/CMakeLists.txt
@@ -0,0 +1,3 @@
+##### icons
+
+tde_install_icons( )
diff --git a/kbruch/src/taskvieweroptionsbase.ui b/kbruch/src/taskvieweroptionsbase.ui
index a35ec107..1e67553b 100644
--- a/kbruch/src/taskvieweroptionsbase.ui
+++ b/kbruch/src/taskvieweroptionsbase.ui
@@ -215,10 +215,8 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdefontdialog.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdefontdialog.h</include>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+</includes>
 </UI>
diff --git a/kbruch/testcases/CMakeLists.txt b/kbruch/testcases/CMakeLists.txt
new file mode 100644
index 00000000..179bb4c1
--- /dev/null
+++ b/kbruch/testcases/CMakeLists.txt
@@ -0,0 +1,33 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../src
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${Boost_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+  ${Boost_LIBRARY_DIRS}
+)
+
+
+##### kbruch_test (test)
+
+tde_add_check_executable( kbruch_test AUTOMOC
+
+  SOURCES
+        ${CMAKE_SOURCE_DIR}/kbruch/src/primenumber.cpp
+        ${CMAKE_SOURCE_DIR}/kbruch/src/ratio.cpp
+        ${CMAKE_SOURCE_DIR}/kbruch/src/task.cpp
+        ratio_test.cpp
+        primenumber_test.cpp
+        kbruch_test.cpp
+  LINK
+     tdeui-shared
+
+  TEST
+)
diff --git a/kbruch/testcases/kbruch_test.cpp b/kbruch/testcases/kbruch_test.cpp
index b4e978d1..a98496eb 100644
--- a/kbruch/testcases/kbruch_test.cpp
+++ b/kbruch/testcases/kbruch_test.cpp
@@ -16,8 +16,8 @@
  ***************************************************************************/
 
 // for BOOST testing
-#include <boost/test/unit_test.hpp>
-using boost::unit_test_framework::test_suite;
+#include <boost/test/included/unit_test.hpp>
+using namespace boost::unit_test;
 
 // the test classes
 #include "primenumber_test.cpp"
@@ -27,11 +27,12 @@ using boost::unit_test_framework::test_suite;
 test_suite* init_unit_test_suite(int /* argc */, char** /* argv */)
 {
 	// create the top test suite
-	std::auto_ptr<test_suite> top_test_suite(BOOST_TEST_SUITE("Master test suite"));
+	test_suite* top_test_suite = BOOST_TEST_SUITE("Master test suite");
 
 	// add test suites to the top test suite
 	top_test_suite->add(new primenumber_test_suite());
 	top_test_suite->add(new ratio_test_suite());
 
-	return top_test_suite.release();
+	framework::master_test_suite().add( top_test_suite );
+	return 0;
 }