[Merge][CMake] Merged revisions : 6973

Revision  r6973
.----------------------
Prevent globbing for CMake modules.

.----------------------


[[Imported from SVN: r7314]]

bin/am2cmake.py

@@ -128,6 +128,7 @@ class target_flags:
         self.suffix=suffix
         self.known_flags = {
             'ALBERTA_CPPFLAGS': ['add_dune_alberta_flags',''],
+            'AM_CPPFLAGS': ['target_link_libraries', '${DUNE_LIBS}'],
             'ALUGRID_CPPFLAGS': ['add_dune_alugrid_flags',''],
             'UG_CPPFLAGS':  ['add_dune_ug_flags', ''],
             'SUPERLU_CPPFLAGS': ['add_dune_superlu_flags', ''],
@@ -711,15 +712,14 @@ def finalize_cmake_module(module_name):
     upper_name =re.sub('-(\S)', lambda m: m.group(1).capitalize(),
                        module_name.capitalize())
     name_wo_dasch=module_name.replace('-', '')
-    lines = ['\nmessage(AUTHOR_WARNING "TODO: Maybe uncomment export line")\n',
-             '#export(TARGETS '+name_wo_dasch+' FILE '+upper_name+'Targets.cmake)\n',
+    lines = ['\nadd_subdirectory(cmake/modules)',
              '# finalize the dune project, e.g. generating config.h etc.\n'
              'finalize_dune_project(GENERATE_CONFIG_H_CMAKE)\n']
     return ''.join(lines)
 
 def create_cmake_dirs_and_file(dirname, module_name):
     upper_name =re.sub('-(\S)', lambda m: m.group(1).capitalize(),
-                       module_name).capitalize()
+                       module_name.capitalize())
     print 'module_name %s' % module_name
     print 'upper_name %s' % upper_name
     dirs={'modules': os.path.join(dirname, 'cmake', 'modules'),
@@ -774,9 +774,14 @@ def create_cmake_dirs_and_file(dirname, module_name):
     output=open(os.path.join(dirname, module_name+'-config.cmake.in'), 'w')
     output.write(''.join(l))
     output.close()
+    # CMakeLists.txt in module directory
+    # list files *.cmake
+    all_cmake_files=[]
+    for root, dirnames, filenames in os.walk(dirs['modules']):
+        all_cmake_files.extend(fnmatch.filter(filenames,'*.cmake')[:])
+    lines=['set(modules \n  ', '\n  '.join(all_cmake_files), '\n)\n']
     output=open(os.path.join(dirs['modules'], 'CMakeLists.txt'), 'w')
-    lines=['file(GLOB modules *.cmake)\n'
-           'install(FILES "${modules}" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/modules)\n']
+    lines.extend(['install(FILES "${modules}" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/modules)\n'])
     output.write(''.join(lines))
     output.close()
     output=open(os.path.join(dirname, module_name+'-version.cmake.in'), 'w')