[Libreoffice-commits] cppunit.git: Branch 'feature/cmake' - 2 commits - examples/CMakeLists.txt examples/hierarchy examples/simple

[Bernhard Sessler]

 examples/CMakeLists.txt           |    2 ++
 examples/hierarchy/CMakeLists.txt |   14 ++++++++++++++
 examples/simple/CMakeLists.txt    |   18 ++++++++++++++++++
 3 files changed, 34 insertions(+)

New commits:
commit 5323c9fd752dad63c72cb45012b1f0fc93a15b7f
Author: Bernhard Sessler <bernhard.sess...@corscience.de>
Date:   Wed Jan 8 16:14:02 2014 +0100

    examples/simple: Build simple example
    
    In case CPPUNIT_BUILD_EXAMPLES is ON, the simple example executable
    and plugin are now built.
    
    Change-Id: Ia88a30805a7063de52b7d21b2f712dba9a65344f
    Signed-off-by: Bernhard Sessler <bernhard.sess...@corscience.de>
    Reviewed-on: https://gerrit.libreoffice.org/7318
    Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 4cdd84a..29e91e1 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_subdirectory(cppunittest)
 add_subdirectory(hierarchy)
+add_subdirectory(simple)
 add_subdirectory(DumperPlugIn)
 
 if(CPPUNIT_BUILD_QT_TESTRUNNER)
diff --git a/examples/simple/CMakeLists.txt b/examples/simple/CMakeLists.txt
new file mode 100644
index 0000000..22f0508
--- /dev/null
+++ b/examples/simple/CMakeLists.txt
@@ -0,0 +1,18 @@
+set(cppunit-simple_SOURCES
+    ExampleTestCase.cpp
+)
+
+# Create the test executable
+add_executable(cppunit-simple-bin Main.cpp ${cppunit-simple_SOURCES})
+target_link_libraries(cppunit-simple-bin cppunit)
+
+# Create the test plugin
+add_library(cppunit-simple-plugin MODULE SimplePlugIn.cpp 
${cppunit-simple_SOURCES})
+target_link_libraries(cppunit-simple-plugin cppunit)
+
+# Create install target
+install(TARGETS cppunit-simple-bin
+    DESTINATION share/${CPPUNIT_VERSION}/examples COMPONENT examples)
+
+install(TARGETS cppunit-simple-plugin
+     DESTINATION share/${CPPUNIT_VERSION}/examples COMPONENT examples)
commit 3a04e47dc8571c3d6f69c8b75a9d58f2004dc0c5
Author: Bernhard Sessler <bernhard.sess...@corscience.de>
Date:   Wed Jan 8 15:56:23 2014 +0100

    examples/hierarchy: Build hierarchy example
    
    When CPPUNIT_BUILD_EXAMPLES is ON, the hierarchy example will now be
    built with CMake.
    
    Change-Id: I1c706c09dbdd450abadf77536ee7a6157bf36612
    Signed-off-by: Bernhard Sessler <bernhard.sess...@corscience.de>
    Reviewed-on: https://gerrit.libreoffice.org/7317
    Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 72fa78c..4cdd84a 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_subdirectory(cppunittest)
+add_subdirectory(hierarchy)
 add_subdirectory(DumperPlugIn)
 
 if(CPPUNIT_BUILD_QT_TESTRUNNER)
diff --git a/examples/hierarchy/CMakeLists.txt 
b/examples/hierarchy/CMakeLists.txt
new file mode 100644
index 0000000..b6fbd44
--- /dev/null
+++ b/examples/hierarchy/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Common source files
+set(cppunit-hierarchy-example-SOURCES
+    BoardGame.cpp
+    Chess.cpp
+    main.cpp
+)
+
+# Create the test executable
+add_executable(cppunit-hierarchy-example ${cppunit-hierarchy-example-SOURCES})
+target_link_libraries(cppunit-hierarchy-example cppunit)
+
+# Create install target
+install(TARGETS cppunit-hierarchy-example
+    DESTINATION share/${CPPUNIT_VERSION}/examples COMPONENT examples)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits