Changeset 7805 for code/forks/sandbox_qt/src

Timestamp:

Dec 25, 2010, 11:58:25 PM (14 years ago)

Author:

rgrieder

Message:

Changed source file handling procedure, especially for Qt moc files.

Location:

code/forks/sandbox_qt/src

Files:

• CMakeLists.txt (modified) (2 diffs)
• orxonox/CMakeLists.txt (modified) (2 diffs)

code/forks/sandbox_qt/src/CMakeLists.txt

@@ -80 +80 @@
 ################## Executable ###################
 
+SET_SOURCE_FILES(ORXONOX_MAIN_SRC_FILES Orxonox.cc)
+
 INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/libraries
@@ -97 +99 @@
     orxonox
   SOURCE_FILES
-    Orxonox.cc
+    ${ORXONOX_MAIN_SRC_FILES}
   OUTPUT_NAME orxonox
 )

code/forks/sandbox_qt/src/orxonox/CMakeLists.txt

@@ -20 +20 @@
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/src/libraries
-  ${CMAKE_CURRENT_SOURCE_DIR}
+  # Make Qt UIC generated header files visible
+  ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 SET_SOURCE_FILES(ORXONOX_SRC_FILES
   Main.cc
-  MainWindow.cc
+
+  QT MainWindow.h       MainWindow.cc
+  QT MainWindow.ui
 )
 
@@ -31 +34 @@
 
 ORXONOX_ADD_LIBRARY(orxonox
-  FIND_HEADER_FILES
-  QT_MOC_FILES
-    MainWindow.h
-  QT_UIC_FILES
-    MainWindow.ui
   LINK_LIBRARIES
     ${QT_QTCORE_LIBRARY}