CMake build procedure improvements

[modules/gui.git] / src / SOCC / CMakeLists.txt

diff --git a/src/SOCC/CMakeLists.txt b/src/SOCC/CMakeLists.txt
index 7e89f1a75649e8a9685d5f5488c109e511ffa901..416e21d4141de1218f73a356b607fdd4397db317 100755 (executable)
--- a/src/SOCC/CMakeLists.txt
+++ b/src/SOCC/CMakeLists.txt
@@ -17,44 +17,67 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+INCLUDE(UseQt4Ext)
+
+# --- options ---
+
+# additional include directories
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
   ${QT_INCLUDES}
-  ${Boost_INCLUDE_DIRS}
-  ${PTHREAD_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
-  ${CMAKE_CURRENT_SOURCE_DIR}/../SUIT
-  ${CMAKE_CURRENT_SOURCE_DIR}/../OBJECT
-  ${CMAKE_CURRENT_SOURCE_DIR}/../Prs
-  ${CMAKE_CURRENT_SOURCE_DIR}/../OCCViewer
-  ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx
+  ${PROJECT_SOURCE_DIR}/src/Qtx
+  ${PROJECT_SOURCE_DIR}/src/SUIT
+  ${PROJECT_SOURCE_DIR}/src/OBJECT
+  ${PROJECT_SOURCE_DIR}/src/Prs
+  ${PROJECT_SOURCE_DIR}/src/OCCViewer
+)
+
+# additional preprocessor / compiler flags
+ADD_DEFINITIONS(${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${OGL_DEFINITIONS})
+
+# libraries to link to
+SET(_link_LIBRARIES
+  ${QT_LIBRARIES} ${CAS_KERNEL} ${CAS_VIEWER}
+  qtx suit SalomeObject SalomePrs OCCViewer
 )
 
-SET(COMMON_LIBS ${QT_LIBRARIES} qtx suit SalomeObject SalomePrs OCCViewer)
+# --- headers ---
 
-SET(GUI_HEADERS   
+# header files / to be processed by moc
+SET(_moc_HEADERS   
   SOCC_ViewModel.h
   SOCC_ViewWindow.h
 )
-QT4_WRAP_CPP(GUI_HEADERS_MOC ${GUI_HEADERS})
 
-SET(SOCC_SOURCES
-  SOCC_ViewModel.cxx
+# header files / no moc processing
+SET(_other_HEADERS
+  SOCC.h
+  SOCC_Prs.h
+)
+
+# header files / to install
+SET(SOCC_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
+
+# --- sources ---
+
+# sources / moc wrappings
+QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+
+# sources / static
+SET(_other_SOURCES
   SOCC_Prs.cxx
+  SOCC_ViewModel.cxx
   SOCC_ViewWindow.cxx
 )
 
-ADD_DEFINITIONS(${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS})
+# sources / to compile
+SET(SOCC_SOURCES ${_other_SOURCES} ${_moc_SOURCES})
 
-ADD_LIBRARY(SOCC ${SOCC_SOURCES} ${GUI_HEADERS_MOC})
-TARGET_LINK_LIBRARIES(SOCC ${COMMON_LIBS})
-INSTALL(TARGETS SOCC EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
+# --- rules ---
 
-SET(COMMON_HEADERS_H 
-  SOCC.h
-  SOCC_ViewModel.h
-  SOCC_Prs.h
-  SOCC_ViewWindow.h
-)
+ADD_LIBRARY(SOCC ${SOCC_SOURCES})
+TARGET_LINK_LIBRARIES(SOCC ${_link_LIBRARIES})
+INSTALL(TARGETS SOCC EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
-INSTALL(FILES ${COMMON_HEADERS_H} DESTINATION ${SALOME_INSTALL_HEADERS})
+INSTALL(FILES ${SOCC_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})