Changeset 7820

Timestamp:

Dec 26, 2010, 9:16:53 PM (14 years ago)

Author:

rgrieder

Message:

Fixed problem with files directly supplied to ORXONOX_ADD_TARGET.

Location:

code/forks/sandbox_qt

Files:

• cmake/tools/SourceFileUtilities.cmake (modified) (1 diff)
• cmake/tools/TargetUtilities.cmake (modified) (1 diff)
• src/CMakeLists.txt (modified) (2 diffs)

code/forks/sandbox_qt/cmake/tools/SourceFileUtilities.cmake

@@ -42 +42 @@
       # Store file with path relative to the root source directory
       FILE(RELATIVE_PATH _file_rel ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${_file})
-      LIST(APPEND _source_files ${_file_rel})
+      LIST(APPEND _source_files ./${_file_rel})
     ENDIF()
   ENDFOREACH(_file)

code/forks/sandbox_qt/cmake/tools/TargetUtilities.cmake

@@ -125 +125 @@
     ELSE()
       # Default, add source file
-      SET(_file ${CMAKE_SOURCE_DIR}/${_file})
+
+      # Prepare relative paths
+      IF(NOT _file MATCHES "^(.\\:|\\/)")
+        # Path can be relative to the current source directory if the file was
+        # not added with the source file macros. Otherwise there is a "./" at
+        # the beginning of each file and the filename is relative
+        # to the CMAKE_SOURCE_DIR
+        STRING(REGEX REPLACE "^\\.\\/(.+)$" "\\1" _temp ${_file})
+        IF(NOT ${_temp} STREQUAL ${_file})
+          SET(_file ${CMAKE_SOURCE_DIR}/${_temp})
+        ELSE()
+          SET(_file ${CMAKE_CURRENT_SOURCE_DIR}/${_file})
+        ENDIF()
+      ENDIF()
+
       LIST(APPEND _${_target_name}_source_files ${_file})
 

code/forks/sandbox_qt/src/CMakeLists.txt

@@ -79 +79 @@
 ################## Executable ###################
 
-SET_SOURCE_FILES(ORXONOX_MAIN_SRC_FILES Orxonox.cc)
-
 INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/libraries
@@ -98 +96 @@
     orxonox
   SOURCE_FILES
-    ${ORXONOX_MAIN_SRC_FILES}
+    Orxonox.cc
   OUTPUT_NAME orxonox
 )