Changeset 2518 for code/branches/buildsystem2/cmake/AddSourceFiles.cmake

Timestamp:

Dec 21, 2008, 10:36:51 PM (16 years ago)

Author:

rgrieder

Message:

Adjusted source file macros to cmake 2.6 because it offers PARENT_SCOPE variable setting which removes my little hack with the CMake cache.
Also notice that the syntax has changed:

ADD_SOURCE_FILES(

Blubb.cc
Asdf.cc

)
ADD_SOURCE_DIRECTORY(ford_prefect)

These two commands can be written in an arbitrary order.
To actually use the created list of souce files, there is a third macro:
WRITE_SOURCE_FILES(myVariableName)

A demonstration can be found by looking at src/orxonox/CMakeLists.txt and src/orxonox/objects/CMakeLists.txt

File:

• code/branches/buildsystem2/cmake/AddSourceFiles.cmake (modified) (1 diff)

code/branches/buildsystem2/cmake/AddSourceFiles.cmake

@@ -16 +16 @@
 #    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
-MACRO(ADD_SOURCE_DIRECTORY _target_list _directory)
+# BIG FAT NOTE:
+# There's possibly a bug in the CMake behaviour when using PARENT_SCOPE.
+# It seems like the parent variable doesn't get updated locally but written
+# correclty to the parent scope. So accessing a parent variable will always
+# return its value BEFORE the local scope was created! Mind this when
+# updating to a new CMake version.
 
-  # Subfolder puts source files into CMake Cache variable _CACHED_SOURCE_FILES
+# Adds source files to the internal handler
+MACRO(ADD_SOURCE_FILES)
+  
+  # Write to parent scoped variables AND to our own scope
+  # (Also see the big fat note at the beginning of the file)
+  # --> _source_files_internal_parent stays constant here, not matter what!
+  SET(_source_files_internal_local ${_source_files_internal_local} ${ARGN})
+  SET(_source_files_internal_parent ${_source_files_internal_local} PARENT_SCOPE)
+
+ENDMACRO(ADD_SOURCE_FILES)
+
+
+# Adds a subdirectory to the internal souce file handler
+MACRO(ADD_SOURCE_DIRECTORY _directory)
+
+  # Save variable
+  SET(_source_files_internal_temp ${_source_files_internal_local})
+  # Clear the local variable because we use it in the child scope
+  SET(_source_files_internal_local)
+
+  # Subfolder puts source files into CMake variable _source_files_internal_parent
   ADD_SUBDIRECTORY(${_directory})
+  # Recover our own local variable
+  SET(_source_files_internal_local ${_source_files_internal_temp})
 
   # Put the directory name in front of each source file from the subfolder
-  # and add it to the source list in the current directory
-  FOREACH(_source_file ${_CACHED_SOURCE_FILES})
-    LIST(APPEND ${_target_list} "${_directory}/${_source_file}")
+  SET(_source_files_internal_temp)
+  FOREACH(_source_file ${_source_files_internal_parent})
+    LIST(APPEND _source_files_internal_temp "${_directory}/${_source_file}")
   ENDFOREACH(_source_file)
+
+  # Add the content of the temporary list
+  ADD_SOURCE_FILES(${_source_files_internal_temp})
 
 ENDMACRO(ADD_SOURCE_DIRECTORY)
 
+# Writes the content from the internal variables to a user specified one
+MACRO(WRITE_SOURCE_FILES _variable_name)
 
-MACRO(ADD_SOURCE_FILES _source_list)
-  
-  # Put the source file into a variable that still exists in this_folder/../
-  # Use FORCE to always overwrite the cache variable
-  SET(_CACHED_SOURCE_FILES ${${_source_list}} CACHE STRING "" FORCE)
-  MARK_AS_ADVANCED(_CACHED_SOURCE_FILES FORCE)
+  SET(${_variable_name} ${_source_files_internal_local})
 
-ENDMACRO(ADD_SOURCE_FILES)
+ENDMACRO(WRITE_SOURCE_FILES)