[Libreoffice-commits] cppunit.git: Branch 'feature/cmake' - examples/qt

Bernhard Sessler bernhard.sessler at corscience.de
Sat Jan 11 08:14:21 PST 2014


 examples/qt/CMakeLists.txt |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 721a1ad7c779786a5a867a2ec24c23917c57ba05
Author: Bernhard Sessler <bernhard.sessler at corscience.de>
Date:   Wed Jan 8 15:37:51 2014 +0100

    examples/qt: Rename executable and fix install path
    
    To get a better structure into the generated libraries and
    executables, the qt_example target is renamed to cppunit-qt-example
    and will be installed to <prefix>/share/cppunit-<version>/examples
    
    Change-Id: I818c33ec2b4de02e1745af51a9c00fb8357cb5ed
    Signed-off-by: Bernhard Sessler <bernhard.sessler at corscience.de>
    Reviewed-on: https://gerrit.libreoffice.org/7312
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/examples/qt/CMakeLists.txt b/examples/qt/CMakeLists.txt
index ea9d142..573465a 100644
--- a/examples/qt/CMakeLists.txt
+++ b/examples/qt/CMakeLists.txt
@@ -2,20 +2,19 @@
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 # Common source files
-set(qt_example_SOURCES
+set(cppunit-qt-example_SOURCES
     ExampleTestCases.cpp
     Main.cpp
 )
 
 # Create the test runner executable
-add_executable(qt_example ${qt_example_SOURCES})
-target_link_libraries(qt_example cppunit-qttestrunner)
+add_executable(cppunit-qt-example ${cppunit-qt-example_SOURCES})
+target_link_libraries(cppunit-qt-example cppunit-qttestrunner)
 
 if(Qt5_POSITION_INDEPENDENT_CODE)
-    set_target_properties(qt_example PROPERTIES POSITION_INDEPENDENT_CODE ON)
+    set_target_properties(cppunit-qt-example PROPERTIES POSITION_INDEPENDENT_CODE ON)
 endif()
 
 # Create install target
-install(TARGETS qt_example
-    RUNTIME DESTINATION bin
-    COMPONENT examples)
+install(TARGETS cppunit-qt-example
+    DESTINATION share/${CPPUNIT_VERSION}/examples COMPONENT examples)


More information about the Libreoffice-commits mailing list