Changes path to find cmake files.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c9af54..70815de 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,36 +50,36 @@ else(enable_coverage)
 endif(enable_coverage)
 
 ### Setup Options
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeOption.txt)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/Option.cmake)
 
 ### Make the *.h files with *.h.in files
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeCompleteInFiles.txt)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/CompleteInFiles.cmake)
 
 ### Define source packages for Libs 
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeDefinePackages.txt)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/DefinePackages.cmake)
 
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeMaintainerMode.txt)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/MaintainerMode.cmake)
 
 ### Setup gcc flags
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeFlags.txt)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/Flags.cmake)
 
 ### Make Libs and Exes
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeMakeExeLib.txt)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/MakeExeLib.cmake)
 
 ### Make Simgrid.jar and Java examples
 if(HAVE_JAVA)
-       include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeJarAndClass.txt)
+       include(${PROJECT_DIRECTORY}/buildtools/Cmake/MakeJava.cmake)
 endif(HAVE_JAVA)
 
 ### Make tests
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeTest.txt)
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CTestConfig.cmake)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/AddTests.cmake)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/CTestConfig.cmake)
 
 ### Setup the distrib
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeDistrib.txt)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/Distrib.cmake)
 
 ### Print ARGS
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakePrintArgs.txt)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/PrintArgs.cmake)
 
 INCLUDE(Dart)
 

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 8f80c10..792c96a 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -262,4 +262,4 @@ add_test(test-simdag-3 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:
 
 add_test(testall               ${CMAKE_BUILD_DIR}/src/testall)
 
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/memcheck_tests.txt)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake)

diff --git a/buildtools/Cmake/CTestTestfile.cmake b/buildtools/Cmake/CTestTestfile.cmake
deleted file mode 100644 (file)
index 97dd2c9..0000000
--- a/buildtools/Cmake/CTestTestfile.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-# CMake generated Testfile for 
-# Source directory: /home/navarrop/Bureau/simgrid/src
-# Build directory: /home/navarrop/Bureau/simgrid/Cmake/src
-# 
-# This file includes the relevent testing commands required for 
-# testing this directory and lists subdirectories to be tested as well.

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 8379ad4..314fc0c 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -692,10 +692,10 @@ endif(ADDR2LINE)
 configure_file(${PROJECT_DIRECTORY}/src/context_sysv_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/src/context_sysv_config.h)
 
 SET( CMAKEDEFINE "#cmakedefine" )
-configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/c_gras_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h" @ONLY IMMEDIATE)
+configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/gras_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h" @ONLY IMMEDIATE)
 configure_file("${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h" "${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h" @ONLY IMMEDIATE)
 configure_file("${PROJECT_DIRECTORY}/include/simgrid_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_config.h" @ONLY IMMEDIATE)
-configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/tracing_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/include/instr/tracing_config.h" @ONLY IMMEDIATE)
+configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/tracing_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/include/instr/tracing_config.h" @ONLY IMMEDIATE)
 configure_file("${CMAKE_CURRENT_BINARY_DIR}/include/instr/tracing_config.h" "${CMAKE_CURRENT_BINARY_DIR}/include/instr/tracing_config.h" @ONLY IMMEDIATE)
 
 if(NOT prefix)

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 3e6b61e..cb41d4d 100755 (executable)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -728,41 +728,39 @@ set(source_to_pack
        ${EXTRA_DIST}
        
        CMakeLists.txt
-       buildtools/Cmake/src/CTestConfig.cmake
-       buildtools/Cmake/src/CTestTestfile.cmake
-       # FIXME: these should be renamed to .cmake, I guess
-       buildtools/Cmake/src/CMakeCompleteInFiles.txt
-       buildtools/Cmake/src/CMakeDefinePackages.txt
-       buildtools/Cmake/src/CMakeDistrib.txt
-       buildtools/Cmake/src/CMakeDocs.txt
-       buildtools/Cmake/src/CMakeFlags.txt
-       buildtools/Cmake/src/CMakeJarAndClass.txt
-       buildtools/Cmake/src/CMakeMaintainerMode.txt
-       buildtools/Cmake/src/CMakeMakeExeLib.txt
-       buildtools/Cmake/src/CMakeOption.txt
-       buildtools/Cmake/src/CMakePrintArgs.txt
-       buildtools/Cmake/src/CMakeSupernovae.txt
-       buildtools/Cmake/src/CMakeTest.txt
-       buildtools/Cmake/src/memcheck_tests.txt
+       buildtools/Cmake/CTestConfig.cmake
+       buildtools/Cmake/CompleteInFiles.cmake
+       buildtools/Cmake/DefinePackages.cmake
+       buildtools/Cmake/Distrib.cmake
+       buildtools/Cmake/GenerateDoc.cmake
+       buildtools/Cmake/Flags.cmake
+       buildtools/Cmake/MakeJava.cmake
+       buildtools/Cmake/MaintainerMode.cmake
+       buildtools/Cmake/MakeExeLib.cmake
+       buildtools/Cmake/Option.cmake
+       buildtools/Cmake/PrintArgs.cmake
+       buildtools/Cmake/Supernovae.cmake
+       buildtools/Cmake/AddTests.cmake
+       buildtools/Cmake/memcheck_tests.cmake
        # FIXME: these should live in src/ and the content of src in root of Cmake/ maybe
-       buildtools/Cmake/prog_test/prog_AC_CHECK_MCSC.c
-       buildtools/Cmake/prog_test/prog_getline.c
-       buildtools/Cmake/prog_test/prog_GRAS_ARCH.c
-       buildtools/Cmake/prog_test/prog_GRAS_CHECK_STRUCT_COMPACTION.c
-       buildtools/Cmake/prog_test/prog_gtnets.cpp
-       buildtools/Cmake/prog_test/prog_max_size.c
-       buildtools/Cmake/prog_test/prog_mutex_timedlock.c
-       buildtools/Cmake/prog_test/prog_printf_null.c
-       buildtools/Cmake/prog_test/prog_sem_init.c
-       buildtools/Cmake/prog_test/prog_sem_timedwait.c
-       buildtools/Cmake/prog_test/prog_snprintf.c
-       buildtools/Cmake/prog_test/prog_stackgrowth.c
-       buildtools/Cmake/prog_test/prog_stacksetup.c
-       buildtools/Cmake/prog_test/prog_va_copy.c
-       buildtools/Cmake/prog_test/prog_vsnprintf.c
+       buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c
+       buildtools/Cmake/test_prog/prog_getline.c
+       buildtools/Cmake/test_prog/prog_GRAS_ARCH.c
+       buildtools/Cmake/test_prog/prog_GRAS_CHECK_STRUCT_COMPACTION.c
+       buildtools/Cmake/test_prog/prog_gtnets.cpp
+       buildtools/Cmake/test_prog/prog_max_size.c
+       buildtools/Cmake/test_prog/prog_mutex_timedlock.c
+       buildtools/Cmake/test_prog/prog_printf_null.c
+       buildtools/Cmake/test_prog/prog_sem_init.c
+       buildtools/Cmake/test_prog/prog_sem_timedwait.c
+       buildtools/Cmake/test_prog/prog_snprintf.c
+       buildtools/Cmake/test_prog/prog_stackgrowth.c
+       buildtools/Cmake/test_prog/prog_stacksetup.c
+       buildtools/Cmake/test_prog/prog_va_copy.c
+       buildtools/Cmake/test_prog/prog_vsnprintf.c
        # FIXME: these are badly named and placed
-       buildtools/Cmake/src/c_gras_config.h.in
-       buildtools/Cmake/src/tracing_config.h.in
+       buildtools/Cmake/gras_config.h.in
+       buildtools/Cmake/tracing_config.h.in
        
        AUTHORS
        ChangeLog

diff --git a/buildtools/Cmake/doc/CMakeLists.txt b/buildtools/Cmake/doc/CMakeLists.txt
index 5651dff..337469b 100644 (file)
--- a/buildtools/Cmake/doc/CMakeLists.txt
+++ b/buildtools/Cmake/doc/CMakeLists.txt
@@ -5,6 +5,6 @@ set(BIBTEX2HTML ${BIBTEX2HTML} CACHE TYPE INTERNAL FORCE)
 
 ### SET THE PROJECT_DIRECTORY
 SET(PROJECT_DIRECTORY "${CMAKE_HOME_DIRECTORY}")
-string(REPLACE "/buildtools/Cmake/src/doc" "" PROJECT_DIRECTORY "${PROJECT_DIRECTORY}")
+string(REPLACE "/buildtools/Cmake/doc" "" PROJECT_DIRECTORY "${PROJECT_DIRECTORY}")
 
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeDocs.txt)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/GenerateDoc.cmake)

diff --git a/buildtools/Cmake/generate_memcheck_tests.pl b/buildtools/Cmake/generate_memcheck_tests.pl
index 6b1d9a5..312d8e4 100755 (executable)
--- a/buildtools/Cmake/generate_memcheck_tests.pl
+++ b/buildtools/Cmake/generate_memcheck_tests.pl
@@ -1,10 +1,10 @@
 #!/usr/bin/perl -w
 use strict;
 
-# input file = CMakeTest.txt
+# input file = AddTest.txt
 
 if($#ARGV!=1) {
-    die "Usage: generate_memcheck_tests.pl <project_directory> <CMakeTests.txt>\n";
+    die "Usage: generate_memcheck_tests.pl <project_directory> AddTests.cmake\n";
 }
 
 my($proj_dir)=$ARGV[0];