[PATCH 2 of 3] Move main's out of the sources for better testing

Wald Commits scm-commit at wald.intevation.org
Thu May 22 12:20:50 CEST 2014


# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1400753994 0
# Node ID bde15f68942bc60c16561ec0c8672017db4a242e
# Parent  5cd525fc91de5af80fca34c8bce3336fead75d3a
Move main's out of the sources for better testing

diff -r 5cd525fc91de -r bde15f68942b ui/CMakeLists.txt
--- a/ui/CMakeLists.txt	Thu May 22 10:19:27 2014 +0000
+++ b/ui/CMakeLists.txt	Thu May 22 10:19:54 2014 +0000
@@ -29,7 +29,6 @@
       "<CMAKE_RC_COMPILER> <FLAGS> <DEFINES> -Ocoff <SOURCE> <OBJECT>")
 
 set(TRUSTBRIDGE_SOURCES
-    ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mainwindow.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/helpdialog.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/certificateitemdelegate.cpp
@@ -42,7 +41,6 @@
 )
 
 set(ADMINSTRATOR_SOURCES
-    ${CMAKE_CURRENT_SOURCE_DIR}/administrator.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/administratorwindow.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/certificatetablemodel.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/certificatetabledelegate.cpp
@@ -128,6 +126,7 @@
       ${CMAKE_CURRENT_SOURCE_DIR}/l10n/administrator_de_DE.ts)
    add_executable(trustbridge-admin
       ${_add_executable_params}
+      ${CMAKE_CURRENT_SOURCE_DIR}/administrator.cpp
       ${ADMINSTRATOR_SOURCES_WITH_RESOURCES}
       ${ADMINISTRATOR_L10N}
       ${ADMINISTRATOR_TRANSLATION}
@@ -139,6 +138,7 @@
       ${CMAKE_CURRENT_SOURCE_DIR}/l10n/trustbridge_de_DE.ts)
    add_executable(trustbridge
       ${_add_executable_params}
+      ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
       ${TRUSTBRIDGE_SOURCES_WITH_RESOURCES}
       ${TRUSTBRIDGE_L10N}
       ${TRUSTBRIDGE_TRANSLATION}
@@ -148,9 +148,11 @@
    message (STATUS "WARNING: Could not find qt linguist tools. Translation will not be included.")
    add_executable(trustbridge-admin
       ${_add_executable_params}
+      ${CMAKE_CURRENT_SOURCE_DIR}/administrator.cpp
       ${ADMINSTRATOR_SOURCES_WITH_RESOURCES})
    add_executable(trustbridge
       ${_add_executable_params}
+      ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
       ${TRUSTBRIDGE_SOURCES_WITH_RESOURCES})
 endif()
 


More information about the Trustbridge-commits mailing list