CMake build procedure improvements

[modules/gui.git] / src / TreeData / Test / CMakeLists.txt

diff --git a/src/TreeData/Test/CMakeLists.txt b/src/TreeData/Test/CMakeLists.txt
index 2f9dc2146a775f101c57032aab89304e99193cdd..741f24cfe3828a3c162983f38ce26d75f3078f0d 100755 (executable)
--- a/src/TreeData/Test/CMakeLists.txt
+++ b/src/TreeData/Test/CMakeLists.txt
@@ -16,8 +16,12 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 INCLUDE(UseQt4Ext)
 
+# --- options ---
+
+# additional include directories
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
   ${QT_INCLUDES}
@@ -27,38 +31,45 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_SOURCE_DIR}/src/TreeData
 )
 
-SET(COMMON_LIBS
+# additional preprocessor / compiler flags
+ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS})
+
+# libraries to link to
+SET(_link_LIBRARIES
   ${CORBA_LIBS}
   ${QT_LIBRARIES}
-  SalomeTreeData
-  SalomeGuiHelpers
-  ${SalomeLifeCycleCORBA}
-  ${SalomeKernelHelpers}
+  SalomeTreeData SalomeGuiHelpers
+  ${KERNEL_SalomeLifeCycleCORBA} ${KERNEL_SalomeKernelHelpers}
 )
 
-SET(GUI_HEADERS mainwindow.hxx)
-QT4_WRAP_CPP(GUI_HEADERS ${GUI_HEADERS})
-SET(GUI_FORMS mainwindow.ui)
-QT4_WRAP_UI(GUI_FORMS_HEADERS ${GUI_FORMS})
+# --- resources ---
 
-SET(TreeData_guitester_SOURCES
-  testhelper.cxx
-  guitester.cxx
-  mainwindow.cxx
-  MyDataModel.cxx
-)
+# resource files / to be processed by uic
+SET(_uic_files mainwindow.ui)
 
-ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS})
+# --- headers ---
 
-ADD_EXECUTABLE(TreeData_guitester ${TreeData_guitester_SOURCES} ${GUI_HEADERS} ${GUI_FORMS_HEADERS})
-TARGET_LINK_LIBRARIES(TreeData_guitester ${COMMON_LIBS})
+# header files / to be processed by moc
+SET(_moc_HEADERS mainwindow.hxx)
 
-SET(TreeData_tester_SOURCES
-  tester.cxx
-  MyDataModel.cxx
-)
+# header files / uic wrappings
+QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
+
+# --- sources ---
+
+# sources / moc wrappings
+QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+
+# sources / to compile
+SET(TreeData_guitester_SOURCES MyDataModel.cxx guitester.cxx mainwindow.cxx testhelper.cxx ${_moc_SOURCES} ${_uic_HEADERS})
+SET(TreeData_tester_SOURCES MyDataModel.cxx tester.cxx)
+
+# --- rules ---
+
+ADD_EXECUTABLE(TreeData_guitester ${TreeData_guitester_SOURCES})
+TARGET_LINK_LIBRARIES(TreeData_guitester ${_link_LIBRARIES})
 
 ADD_EXECUTABLE(TreeData_tester ${TreeData_tester_SOURCES})
-TARGET_LINK_LIBRARIES(TreeData_tester ${COMMON_LIBS})
+TARGET_LINK_LIBRARIES(TreeData_tester ${_link_LIBRARIES})
 
 INSTALL(TARGETS TreeData_guitester TreeData_tester DESTINATION ${SALOME_INSTALL_BINS})