Cosmetics. Rename simgrid_BINARY_DIR for PROJECT_BINARY_DIR.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index db45e7e..8867ce0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,8 @@ cmake_minimum_required(VERSION 2.6)
 if(WIN32)
     SET(CMAKE_RC_COMPILER "windres")
 endif(WIN32)
 if(WIN32)
     SET(CMAKE_RC_COMPILER "windres")
 endif(WIN32)

-project(simgrid CXX C)
+project(SimGrid CXX C)
+

 set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE)
 set(CMAKE_CXX_FLAGS "" CACHE TYPE INTERNAL FORCE)
 set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE)
 set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE)
 set(CMAKE_CXX_FLAGS "" CACHE TYPE INTERNAL FORCE)
 set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE)

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 57c7461..1f422e1 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -294,14 +294,14 @@ IF(CMAKE_CROSSCOMPILING)
        ENDIF(WIN32)
 ELSE(CMAKE_CROSSCOMPILING)
        try_run(RUN_mcsc_VAR COMPILE_mcsc_VAR
        ENDIF(WIN32)
 ELSE(CMAKE_CROSSCOMPILING)
        try_run(RUN_mcsc_VAR COMPILE_mcsc_VAR

-               ${simgrid_BINARY_DIR}
+               ${PROJECT_BINARY_DIR}

                ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c
                COMPILE_DEFINITIONS "${mcsc_flags}"
                OUTPUT_VARIABLE var_compil
                )
                
                ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c
                COMPILE_DEFINITIONS "${mcsc_flags}"
                OUTPUT_VARIABLE var_compil
                )
                

-               if(EXISTS "${simgrid_BINARY_DIR}/conftestval" AND COMPILE_mcsc_VAR)
-                       file(READ "${simgrid_BINARY_DIR}/conftestval" mcsc)
+               if(EXISTS "${PROJECT_BINARY_DIR}/conftestval" AND COMPILE_mcsc_VAR)
+                       file(READ "${PROJECT_BINARY_DIR}/conftestval" mcsc)

                        STRING(REPLACE "\n" "" mcsc "${mcsc}")
                        if(mcsc)
                                set(mcsc "yes")
                        STRING(REPLACE "\n" "" mcsc "${mcsc}")
                        if(mcsc)
                                set(mcsc "yes")


@@ -309,9 +309,9 @@ ELSE(CMAKE_CROSSCOMPILING)
                        else(mcsc)
                                set(mcsc "no")
                        endif(mcsc)
                        else(mcsc)
                                set(mcsc "no")
                        endif(mcsc)

-           else(EXISTS "${simgrid_BINARY_DIR}/conftestval" AND COMPILE_mcsc_VAR)
+           else(EXISTS "${PROJECT_BINARY_DIR}/conftestval" AND COMPILE_mcsc_VAR)

                        set(mcsc "no")
                        set(mcsc "no")

-               endif(EXISTS "${simgrid_BINARY_DIR}/conftestval" AND COMPILE_mcsc_VAR)
+               endif(EXISTS "${PROJECT_BINARY_DIR}/conftestval" AND COMPILE_mcsc_VAR)

 ENDIF(CMAKE_CROSSCOMPILING)
 
 if(mcsc MATCHES "no" AND pthread)
 ENDIF(CMAKE_CROSSCOMPILING)
 
 if(mcsc MATCHES "no" AND pthread)


@@ -372,7 +372,7 @@ endif(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/)
 IF(NOT CMAKE_CROSSCOMPILING)
 # Check architecture signature begin
 try_run(RUN_GRAS_VAR COMPILE_GRAS_VAR
 IF(NOT CMAKE_CROSSCOMPILING)
 # Check architecture signature begin
 try_run(RUN_GRAS_VAR COMPILE_GRAS_VAR

-       ${simgrid_BINARY_DIR}
+       ${PROJECT_BINARY_DIR}

        ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_GRAS_ARCH.c
        RUN_OUTPUT_VARIABLE var1
        )
        ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_GRAS_ARCH.c
        RUN_OUTPUT_VARIABLE var1
        )


@@ -483,7 +483,7 @@ endif(GRAS_THISARCH MATCHES "none")
 
 # Check architecture signature end
 try_run(RUN_GRAS_VAR COMPILE_GRAS_VAR
 
 # Check architecture signature end
 try_run(RUN_GRAS_VAR COMPILE_GRAS_VAR

-       ${simgrid_BINARY_DIR}
+       ${PROJECT_BINARY_DIR}

        ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_GRAS_CHECK_STRUCT_COMPACTION.c
        RUN_OUTPUT_VARIABLE var2
        )
        ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_GRAS_CHECK_STRUCT_COMPACTION.c
        RUN_OUTPUT_VARIABLE var2
        )


@@ -494,7 +494,7 @@ endforeach(var_tmp ${var2})
 
 # Check for [SIZEOF_MAX]
 try_run(RUN_SM_VAR COMPILE_SM_VAR
 
 # Check for [SIZEOF_MAX]
 try_run(RUN_SM_VAR COMPILE_SM_VAR

-       ${simgrid_BINARY_DIR}
+       ${PROJECT_BINARY_DIR}

        ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_max_size.c
        RUN_OUTPUT_VARIABLE var3
        )
        ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_max_size.c
        RUN_OUTPUT_VARIABLE var3
        )


@@ -520,11 +520,11 @@ if(HAVE_MAKECONTEXT OR WIN32)
        endif(WIN32 AND __GNUC__)
        
        try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR
        endif(WIN32 AND __GNUC__)
        
        try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR

-               ${simgrid_BINARY_DIR}
+               ${PROJECT_BINARY_DIR}

                ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_stacksetup.c
                COMPILE_DEFINITIONS "${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2}"
                )
                ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_stacksetup.c
                COMPILE_DEFINITIONS "${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2}"
                )

-       file(READ ${simgrid_BINARY_DIR}/conftestval MAKECONTEXT_ADDR_SIZE)
+       file(READ ${PROJECT_BINARY_DIR}/conftestval MAKECONTEXT_ADDR_SIZE)

        string(REPLACE "\n" "" MAKECONTEXT_ADDR_SIZE "${MAKECONTEXT_ADDR_SIZE}")
        string(REGEX MATCH ;^.*,;MAKECONTEXT_ADDR "${MAKECONTEXT_ADDR_SIZE}")
        string(REGEX MATCH ;,.*$; MAKECONTEXT_SIZE "${MAKECONTEXT_ADDR_SIZE}")
        string(REPLACE "\n" "" MAKECONTEXT_ADDR_SIZE "${MAKECONTEXT_ADDR_SIZE}")
        string(REGEX MATCH ;^.*,;MAKECONTEXT_ADDR "${MAKECONTEXT_ADDR_SIZE}")
        string(REGEX MATCH ;,.*$; MAKECONTEXT_SIZE "${MAKECONTEXT_ADDR_SIZE}")


@@ -540,10 +540,10 @@ endif(HAVE_MAKECONTEXT OR WIN32)
 ### check for stackgrowth
 if (NOT CMAKE_CROSSCOMPILING)
        try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR
 ### check for stackgrowth
 if (NOT CMAKE_CROSSCOMPILING)
        try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR

-               ${simgrid_BINARY_DIR}
+               ${PROJECT_BINARY_DIR}

                ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_stackgrowth.c
                )
                ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_stackgrowth.c
                )

-file(READ "${simgrid_BINARY_DIR}/conftestval" stack)
+file(READ "${PROJECT_BINARY_DIR}/conftestval" stack)

 if(stack MATCHES "down")
        set(PTH_STACKGROWTH "-1")
 endif(stack MATCHES "down")
 if(stack MATCHES "down")
        set(PTH_STACKGROWTH "-1")
 endif(stack MATCHES "down")


@@ -565,7 +565,7 @@ endif(NOT CMAKE_CROSSCOMPILING)
 
 #AC_PRINTF_NULL
 try_run(RUN_PRINTF_NULL_VAR COMPILE_PRINTF_NULL_VAR
 
 #AC_PRINTF_NULL
 try_run(RUN_PRINTF_NULL_VAR COMPILE_PRINTF_NULL_VAR

-       ${simgrid_BINARY_DIR}
+       ${PROJECT_BINARY_DIR}

        ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_printf_null.c
        )
 
        ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_printf_null.c
        )
 


@@ -618,7 +618,7 @@ foreach(fct ${diff_va})
        }"
        )
        try_compile(COMPILE_VA_NULL_VAR
        }"
        )
        try_compile(COMPILE_VA_NULL_VAR

-       ${simgrid_BINARY_DIR}
+       ${PROJECT_BINARY_DIR}

        ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_va_copy.c
        )
        if(COMPILE_VA_NULL_VAR)
        ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_va_copy.c
        )
        if(COMPILE_VA_NULL_VAR)


@@ -676,7 +676,7 @@ endforeach(fct ${diff_va})
 #--------------------------------------------------------------------------------------------------
 ### check for getline
 try_compile(COMPILE_RESULT_VAR
 #--------------------------------------------------------------------------------------------------
 ### check for getline
 try_compile(COMPILE_RESULT_VAR

-       ${simgrid_BINARY_DIR}
+       ${PROJECT_BINARY_DIR}

        ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_getline.c
        )
 
        ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_getline.c
        )
 


@@ -700,7 +700,7 @@ if(HAVE_SNPRINTF AND HAVE_VSNPRINTF OR WIN32)
                #set(PREFER_PORTABLE_SNPRINTF 1)
        else(CMAKE_CROSSCOMPILING)
            try_run(RUN_SNPRINTF_FUNC_VAR COMPILE_SNPRINTF_FUNC_VAR
                #set(PREFER_PORTABLE_SNPRINTF 1)
        else(CMAKE_CROSSCOMPILING)
            try_run(RUN_SNPRINTF_FUNC_VAR COMPILE_SNPRINTF_FUNC_VAR

-               ${simgrid_BINARY_DIR}
+               ${PROJECT_BINARY_DIR}

                ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_snprintf.c
            )   
        endif(CMAKE_CROSSCOMPILING)
                ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_snprintf.c
            )   
        endif(CMAKE_CROSSCOMPILING)


@@ -710,7 +710,7 @@ if(HAVE_SNPRINTF AND HAVE_VSNPRINTF OR WIN32)
                set(PREFER_PORTABLE_VSNPRINTF 1)
        else(CMAKE_CROSSCOMPILING)
           try_run(RUN_VSNPRINTF_FUNC_VAR COMPILE_VSNPRINTF_FUNC_VAR
                set(PREFER_PORTABLE_VSNPRINTF 1)
        else(CMAKE_CROSSCOMPILING)
           try_run(RUN_VSNPRINTF_FUNC_VAR COMPILE_VSNPRINTF_FUNC_VAR

-               ${simgrid_BINARY_DIR}
+               ${PROJECT_BINARY_DIR}

                ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_vsnprintf.c
           )
        endif(CMAKE_CROSSCOMPILING)
                ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_vsnprintf.c
           )
        endif(CMAKE_CROSSCOMPILING)

diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
index f322349..3f07308 100644 (file)
--- a/buildtools/Cmake/Distrib.cmake
+++ b/buildtools/Cmake/Distrib.cmake
@@ -170,11 +170,11 @@ endif(HAVE_LUA)
 
 add_custom_target(dist-dir
   COMMENT "Generating the distribution directory"
 
 add_custom_target(dist-dir
   COMMENT "Generating the distribution directory"

-  COMMAND test -e simgrid-${release_version}/ && chmod -R a+w simgrid-${release_version}/ || true
-  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/
-  COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}
-  COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}/doc/html/
-  COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/doc/html/ simgrid-${release_version}/doc/html/
+  COMMAND test -e ${PROJECT_NAME}-${release_version}/ && chmod -R a+w ${PROJECT_NAME}-${release_version}/ || true
+  COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}/
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/doc/html/
+  COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/doc/html/ ${PROJECT_NAME}-${release_version}/doc/html/

 )
 add_dependencies(dist-dir simgrid_documentation)
 add_dependencies(dist-dir maintainer_files)
 )
 add_dependencies(dist-dir simgrid_documentation)
 add_dependencies(dist-dir maintainer_files)


@@ -192,19 +192,19 @@ foreach(file ${source_to_pack})
        set(dirs_in_tarball "${dirs_in_tarball};${file_location};")
        add_custom_command(
          TARGET dist-dir
        set(dirs_in_tarball "${dirs_in_tarball};${file_location};")
        add_custom_command(
          TARGET dist-dir

-         COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}/${file_location}/
+         COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/${file_location}/

        )       
    endif(NOT OPERATION)
    
    # Actually copy the file
    add_custom_command(
      TARGET dist-dir
        )       
    endif(NOT OPERATION)
    
    # Actually copy the file
    add_custom_command(
      TARGET dist-dir

-     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/${file} simgrid-${release_version}/${file_location}/
+     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/${file} ${PROJECT_NAME}-${release_version}/${file_location}/

    )
    
    add_custom_command(
      TARGET dist-dir
    )
    
    add_custom_command(
      TARGET dist-dir

-     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Makefile.default simgrid-${release_version}/Makefile
+     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Makefile.default ${PROJECT_NAME}-${release_version}/Makefile

    )
 endforeach(file ${source_to_pack})
 
    )
 endforeach(file ${source_to_pack})
 


@@ -213,14 +213,14 @@ endforeach(file ${source_to_pack})
 ######################################
 
 add_custom_target(dist
 ######################################
 
 add_custom_target(dist

-  DEPENDS ${CMAKE_BINARY_DIR}/simgrid-${release_version}.tar.gz
+  DEPENDS ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-${release_version}.tar.gz

 )
 add_custom_command(
 )
 add_custom_command(

-       OUTPUT ${CMAKE_BINARY_DIR}/simgrid-${release_version}.tar.gz    
+       OUTPUT ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-${release_version}.tar.gz    

        COMMENT "Compressing the archive from the distribution directory"
        COMMENT "Compressing the archive from the distribution directory"

-       COMMAND ${CMAKE_COMMAND} -E tar cf simgrid-${release_version}.tar simgrid-${release_version}/
-       COMMAND gzip -9v simgrid-${release_version}.tar
-       COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/
+       COMMAND ${CMAKE_COMMAND} -E tar cf ${PROJECT_NAME}-${release_version}.tar ${PROJECT_NAME}-${release_version}/
+       COMMAND gzip -9v ${PROJECT_NAME}-${release_version}.tar
+       COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}/

 )
 add_dependencies(dist dist-dir)
 
 )
 add_dependencies(dist dist-dir)
 


@@ -231,44 +231,44 @@ add_dependencies(dist dist-dir)
 # Allow to test the "make dist"
 add_custom_target(distcheck
   COMMAND ${CMAKE_COMMAND} -E echo "XXX remove old copy"
 # Allow to test the "make dist"
 add_custom_target(distcheck
   COMMAND ${CMAKE_COMMAND} -E echo "XXX remove old copy"

-  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}.cpy 
+  COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}.cpy 

   COMMAND ${CMAKE_COMMAND} -E echo "XXX copy again the source tree"
   COMMAND ${CMAKE_COMMAND} -E echo "XXX copy again the source tree"

-  COMMAND ${CMAKE_COMMAND} -E copy_directory simgrid-${release_version}/ simgrid-${release_version}.cpy 
+  COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_NAME}-${release_version}/ ${PROJECT_NAME}-${release_version}.cpy 

   COMMAND ${CMAKE_COMMAND} -E echo "XXX create build and install subtrees"
   COMMAND ${CMAKE_COMMAND} -E echo "XXX create build and install subtrees"

-  COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}/_build
-  COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}/_inst
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/_build
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/_inst

  
   # This stupid cmake creates a directory in source, killing the purpose of the chmod
   # (tricking around)
   COMMAND ${CMAKE_COMMAND} -E echo "XXX change the modes of directories"
  
   # This stupid cmake creates a directory in source, killing the purpose of the chmod
   # (tricking around)
   COMMAND ${CMAKE_COMMAND} -E echo "XXX change the modes of directories"

-  COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}/CMakeFiles 
-  COMMAND chmod -R a-w simgrid-${release_version}/ # FIXME: we should pass without commenting that line
-  COMMAND chmod -R a+w simgrid-${release_version}/_build
-  COMMAND chmod -R a+w simgrid-${release_version}/_inst
-  COMMAND chmod -R a+w simgrid-${release_version}/CMakeFiles
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/CMakeFiles 
+  COMMAND chmod -R a-w ${PROJECT_NAME}-${release_version}/ # FIXME: we should pass without commenting that line
+  COMMAND chmod -R a+w ${PROJECT_NAME}-${release_version}/_build
+  COMMAND chmod -R a+w ${PROJECT_NAME}-${release_version}/_inst
+  COMMAND chmod -R a+w ${PROJECT_NAME}-${release_version}/CMakeFiles

   
   COMMAND ${CMAKE_COMMAND} -E echo "XXX Configure"
   
   COMMAND ${CMAKE_COMMAND} -E echo "XXX Configure"

-  COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build ${CMAKE_COMMAND} build ..  -DCMAKE_INSTALL_PREFIX=../_inst -Wno-dev -Denable_doc=OFF
-#  COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build make dist-dir
+  COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_NAME}-${release_version}/_build ${CMAKE_COMMAND} build ..  -DCMAKE_INSTALL_PREFIX=../_inst -Wno-dev -Denable_doc=OFF
+#  COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_NAME}-${release_version}/_build make dist-dir

   COMMAND ${CMAKE_COMMAND} -E echo "XXX Build"
   COMMAND ${CMAKE_COMMAND} -E echo "XXX Build"

-  COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build make VERBOSE=1
+  COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_NAME}-${release_version}/_build make VERBOSE=1

   
   # This fails, unfortunately, because GRAS is broken for now
   
   # This fails, unfortunately, because GRAS is broken for now

-  COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build ctest -j5 --output-on-failure
+  COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_NAME}-${release_version}/_build ctest -j5 --output-on-failure

 
   COMMAND ${CMAKE_COMMAND} -E echo "XXX Check that cleaning works"
 
   COMMAND ${CMAKE_COMMAND} -E echo "XXX Check that cleaning works"

-  COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build make clean
+  COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_NAME}-${release_version}/_build make clean

   COMMAND ${CMAKE_COMMAND} -E echo "XXX Display what is remaining after make clean"
   COMMAND ${CMAKE_COMMAND} -E echo "XXX Display what is remaining after make clean"

-  COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build ls -lR
+  COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_NAME}-${release_version}/_build ls -lR

   COMMAND ${CMAKE_COMMAND} -E echo "XXX Remove _build and _inst directories"
   COMMAND ${CMAKE_COMMAND} -E echo "XXX Remove _build and _inst directories"

-  COMMAND chmod a+w simgrid-${release_version}/
-  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/_build
-  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/_inst
+  COMMAND chmod a+w ${PROJECT_NAME}-${release_version}/
+  COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}/_build
+  COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}/_inst

   COMMAND ${CMAKE_COMMAND} -E echo "XXX The output of the diff follows"
   COMMAND ${CMAKE_COMMAND} -E echo "XXX The output of the diff follows"

-  COMMAND diff -ruN simgrid-${release_version}.cpy simgrid-${release_version}
+  COMMAND diff -ruN ${PROJECT_NAME}-${release_version}.cpy ${PROJECT_NAME}-${release_version}

   COMMAND ${CMAKE_COMMAND} -E echo "XXX end of the diff, random cleanups now"
   COMMAND ${CMAKE_COMMAND} -E echo "XXX end of the diff, random cleanups now"

-  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}.cpy 
-  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}
+  COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}.cpy 
+  COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}

 )
 add_dependencies(distcheck dist-dir)
 
 )
 add_dependencies(distcheck dist-dir)
 

diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index 2ed1608..5b9912f 100644 (file)
--- a/buildtools/Cmake/PrintArgs.cmake
+++ b/buildtools/Cmake/PrintArgs.cmake
@@ -111,9 +111,9 @@ message("   Smpi dependencies   :   ${SMPI_DEP}")
 message("")
 message("      INSTALL_PREFIX:         ${CMAKE_INSTALL_PREFIX}")
 
 message("")
 message("      INSTALL_PREFIX:         ${CMAKE_INSTALL_PREFIX}")
 

-exec_program("${CMAKE_COMMAND} -E make_directory ${simgrid_BINARY_DIR}/Testing/Notes/" OUTPUT_VARIABLE OKIDOKI)
-file(WRITE ${simgrid_BINARY_DIR}/Testing/Notes/Build  "SVN version : ${SVN_VERSION}\n")
-file(APPEND ${simgrid_BINARY_DIR}/Testing/Notes/Build "Release     : simgrid-${release_version}\n")
-file(APPEND ${simgrid_BINARY_DIR}/Testing/Notes/Build "Pipol user  : $ENV{PIPOL_USER}\n")
-file(APPEND ${simgrid_BINARY_DIR}/Testing/Notes/Build "Pipol image : $ENV{PIPOL_IMAGE}\n")
+exec_program("${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/Testing/Notes/" OUTPUT_VARIABLE OKIDOKI)
+file(WRITE ${PROJECT_BINARY_DIR}/Testing/Notes/Build  "SVN version : ${SVN_VERSION}\n")
+file(APPEND ${PROJECT_BINARY_DIR}/Testing/Notes/Build "Release     : simgrid-${release_version}\n")
+file(APPEND ${PROJECT_BINARY_DIR}/Testing/Notes/Build "Pipol user  : $ENV{PIPOL_USER}\n")
+file(APPEND ${PROJECT_BINARY_DIR}/Testing/Notes/Build "Pipol image : $ENV{PIPOL_IMAGE}\n")