Add files to dist.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7440 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/Cmake/src/CMakeDefinePackages.txt b/buildtools/Cmake/src/CMakeDefinePackages.txt
index 21c17f8..93043e2 100644 (file)
--- a/buildtools/Cmake/src/CMakeDefinePackages.txt
+++ b/buildtools/Cmake/src/CMakeDefinePackages.txt
@@ -542,6 +542,7 @@ file(GLOB_RECURSE add_src_files
 "${PROJECT_DIRECTORY}/teshsuite/*CMakeLists.txt"
 "${PROJECT_DIRECTORY}/testsuite/*CMakeLists.txt"
 "${PROJECT_DIRECTORY}/tools/*CMakeLists.txt"
+"${PROJECT_DIRECTORY}/src/*CMakeLists.txt"
 "${PROJECT_DIRECTORY}/examples/*.java"
 )
 #message("\n\nadd_src_files:\n${add_src_files}")

diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index cf416d2..df9428f 100644 (file)
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -30,6 +30,7 @@ set(to_svg
        ${xml_files}
        ${tesh_files}
        ${txt_files}
+       ${TEST_CFILES}
        ${PROJECT_DIRECTORY}/./CMakeLists.txt
        ${PROJECT_DIRECTORY}/./AUTHORS
        ${PROJECT_DIRECTORY}/./ChangeLog
@@ -46,15 +47,19 @@ set(to_svg
        ${PROJECT_DIRECTORY}/./src/bindings/ruby/simgrid_ruby.c
        ${PROJECT_DIRECTORY}/./src/bindings/ruby_bindings.h
        ${PROJECT_DIRECTORY}/./src/simix/smx_context_sysv_private.h
+       ${PROJECT_DIRECTORY}/./src/simgrid_units_main.c
 )
        
 foreach(file ${to_svg})
        get_filename_component(file_location ${file} PATH)
        string(REPLACE "${PROJECT_DIRECTORY}/" "/" file_location ${file_location})
-       #message("install: ${file}\nDESTINATION: ${file_location}")
        install(FILES ${file} DESTINATION "${file_location}")
 endforeach(file ${EXTRA_DIST})
 
+foreach(file ${TEST_UNITS})
+       install(FILES src/${file} DESTINATION "/src/")
+endforeach(file ${TEST_UNITS})
+
 ###copy doc
 install(DIRECTORY "${PROJECT_DIRECTORY}/doc/"
 DESTINATION "/doc/"

diff --git a/buildtools/Cmake/src/CMakeFLEXml.txt b/buildtools/Cmake/src/CMakeFLEXml.txt
index 65f4921..d5c7623 100644 (file)
--- a/buildtools/Cmake/src/CMakeFLEXml.txt
+++ b/buildtools/Cmake/src/CMakeFLEXml.txt
@@ -104,8 +104,8 @@ if(PERL_EXE)
        exec_program("rm -f simgrid_units_main.c *_unit.c ${PROJECT_DIRECTORY}/src/simgrid_units_main.c ${PROJECT_DIRECTORY}/src/*_unit.c" "${PROJECT_DIRECTORY}/src/" OUTPUT_VARIABLE OKITOKI)
 
        #$(TEST_UNITS): $(TEST_CFILES)
-       string(REPLACE ";" " " TEST_CFILES "${TEST_CFILES}")
-       exec_program("${PROJECT_DIRECTORY}/tools/sg_unit_extractor.pl ${TEST_CFILES}" "${PROJECT_DIRECTORY}/src/")
+       string(REPLACE ";" " " USE_TEST_CFILES "${TEST_CFILES}")
+       exec_program("${PROJECT_DIRECTORY}/tools/sg_unit_extractor.pl ${USE_TEST_CFILES}" "${PROJECT_DIRECTORY}/src/")
 
        #@builddir@/simgrid_units_main.c: $(TEST_UNITS)
        exec_program("${PROJECT_DIRECTORY}/tools/sg_unit_extractor.pl ${PROJECT_DIRECTORY}/src/xbt/cunit.c" "${PROJECT_DIRECTORY}/src/")