Try to be compatible with mac command.

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

diff --git a/buildtools/Cmake/src/CMakeDefinePackages.txt b/buildtools/Cmake/src/CMakeDefinePackages.txt
index a45bfc4..abbaad6 100755 (executable)
--- a/buildtools/Cmake/src/CMakeDefinePackages.txt
+++ b/buildtools/Cmake/src/CMakeDefinePackages.txt
@@ -319,9 +319,15 @@ set(install_libs
 ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.*
 ${PROJECT_DIRECTORY}/src/.libs/libsimgrid_static.*
 ${PROJECT_DIRECTORY}/src/.libs/libgras.*
 ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.*
 ${PROJECT_DIRECTORY}/src/.libs/libsimgrid_static.*
 ${PROJECT_DIRECTORY}/src/.libs/libgras.*

-${PROJECT_DIRECTORY}/src/.libs/libsmpi.*

 )
 
 )
 

+if(enable_smpi)
+       set(install_libs
+       ${install_libs}
+       ${PROJECT_DIRECTORY}/src/.libs/libsmpi.*
+       )
+endif(enable_smpi)
+

 set(install_HEADERS
 ./include/gras.h 
 ./include/xbt.h
 set(install_HEADERS
 ./include/gras.h 
 ./include/xbt.h


@@ -560,7 +566,21 @@ file(GLOB_RECURSE ex_to_svg
 "${PROJECT_DIRECTORY}/examples/*.java"
 "${PROJECT_DIRECTORY}/examples/*.xml"
 )
 "${PROJECT_DIRECTORY}/examples/*.java"
 "${PROJECT_DIRECTORY}/examples/*.xml"
 )

-#message("\n\nadd_src_files:\n${add_src_files}")
+string(REPLACE "${PROJECT_DIRECTORY}/" "" ex_to_svg "${ex_to_svg}")
+foreach(file ${ex_to_svg})
+       string(REGEX REPLACE "/[^/]*$" "" file "${file}")
+       set(new_ex_to_svg "${new_ex_to_svg}${file};")
+endforeach(file ${ex_to_svg})
+
+set(directory_to_create "")
+
+foreach(file ${new_ex_to_svg})
+       string(REGEX MATCH "${file};" OPERATION "${directory_to_create}")
+       if(NOT OPERATION)
+               set(directory_to_create "${directory_to_create}${file};")
+       endif(NOT OPERATION)
+endforeach(file ${new_ex_to_svg})
+

 
 file(GLOB_RECURSE include_files
 "${PROJECT_DIRECTORY}/include/*.h"
 
 file(GLOB_RECURSE include_files
 "${PROJECT_DIRECTORY}/include/*.h"

diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index 5b97825..fd36960 100755 (executable)
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -41,13 +41,12 @@ PATTERN "*~" EXCLUDE
 set(CPACK_SET_DESTDIR on)
 set(CMAKE_INSTALL_PREFIX ${prefix} CACHE TYPE INTERNAL FORCE)
 
 set(CPACK_SET_DESTDIR on)
 set(CMAKE_INSTALL_PREFIX ${prefix} CACHE TYPE INTERNAL FORCE)
 

-string(REPLACE ";" "\t" install_HEADERS "${install_HEADERS}")

 string(REPLACE ";" "\t" install_libs "${install_libs}")
 set(uninstall_bins "${install_bins}")
 string(REPLACE "${PROJECT_DIRECTORY}/src/smpi" "${prefix}/bin" uninstall_bins "${uninstall_bins}")
 string(REPLACE "${PROJECT_DIRECTORY}/tools/gras" "${prefix}/bin" uninstall_bins "${uninstall_bins}")
 string(REPLACE "${PROJECT_DIRECTORY}/tools/tesh" "${prefix}/bin" uninstall_bins "${uninstall_bins}")
 string(REPLACE ";" "\t" install_libs "${install_libs}")
 set(uninstall_bins "${install_bins}")
 string(REPLACE "${PROJECT_DIRECTORY}/src/smpi" "${prefix}/bin" uninstall_bins "${uninstall_bins}")
 string(REPLACE "${PROJECT_DIRECTORY}/tools/gras" "${prefix}/bin" uninstall_bins "${uninstall_bins}")
 string(REPLACE "${PROJECT_DIRECTORY}/tools/tesh" "${prefix}/bin" uninstall_bins "${uninstall_bins}")

-string(REPLACE "${PROJECT_DIRECTORY}/tools/MSG_visualization/colorize.pl" "${prefix}/bin/simgrid_colorizer.pl" uninstall_bins "${uninstall_bins}")
+string(REPLACE "${PROJECT_DIRECTORY}/tools/MSG_visualization/colorize.pl" "${prefix}/bin/simgrid-colorizer" uninstall_bins "${uninstall_bins}")

 string(REPLACE "${PROJECT_DIRECTORY}/src/.libs" "${prefix}/lib" uninstall_libs "${install_libs}")
 string(REPLACE "./" "${prefix}/" uninstall_HEADERS "${install_HEADERS}")
 
 string(REPLACE "${PROJECT_DIRECTORY}/src/.libs" "${prefix}/lib" uninstall_libs "${install_libs}")
 string(REPLACE "./" "${prefix}/" uninstall_HEADERS "${install_HEADERS}")
 


@@ -61,27 +60,31 @@ COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include
 COMMAND mkdir -p $ENV{DESTDIR}${prefix}/doc
 COMMAND mkdir -p $ENV{DESTDIR}${prefix}/doc/simgrid
 COMMAND mkdir -p $ENV{DESTDIR}${prefix}/doc/simgrid/html
 COMMAND mkdir -p $ENV{DESTDIR}${prefix}/doc
 COMMAND mkdir -p $ENV{DESTDIR}${prefix}/doc/simgrid
 COMMAND mkdir -p $ENV{DESTDIR}${prefix}/doc/simgrid/html

+COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include
+COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/xbt
+COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/msg
+COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/simdag
+COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/smpi
+COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/surf
+COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/gras
+COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/amok
+COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/instr

 COMMAND cp ${install_bins} $ENV{DESTDIR}${prefix}/bin
 COMMAND cp ${install_bins} $ENV{DESTDIR}${prefix}/bin

-COMMAND cp ${PROJECT_DIRECTORY}/tools/MSG_visualization/colorize.pl $ENV{DESTDIR}${prefix}/bin/simgrid_colorizer.pl
+COMMAND cp ${PROJECT_DIRECTORY}/tools/MSG_visualization/colorize.pl $ENV{DESTDIR}${prefix}/bin/simgrid-colorizer

 COMMAND echo "install bin           OK"
 COMMAND cp ${install_libs} $ENV{DESTDIR}${prefix}/lib
 COMMAND echo "install lib           OK"
 COMMAND echo "install bin           OK"
 COMMAND cp ${install_libs} $ENV{DESTDIR}${prefix}/lib
 COMMAND echo "install lib           OK"

-COMMAND cp --parents ${install_HEADERS} $ENV{DESTDIR}${prefix}
-COMMAND echo "install include       OK"
-COMMAND cp -rf ${PROJECT_DIRECTORY}/doc/html/ $ENV{DESTDIR}${prefix}/doc/simgrid
-COMMAND echo "install doc/html      OK"

 WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
 )
 
 WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
 )
 

-foreach(file ${ex_to_svg})
-       string(REPLACE "${PROJECT_DIRECTORY}" "." file "${file}")
+foreach(file ${install_HEADERS})

        add_custom_command(TARGET install-simgrid
        add_custom_command(TARGET install-simgrid

-               COMMAND cp --parents -f ${file} $ENV{DESTDIR}${prefix}/doc/simgrid/
+               COMMAND cp ${file} $ENV{DESTDIR}${prefix}/${file}

                WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
        )
                WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
        )

-endforeach(file ${ex_to_svg})
+endforeach(file ${install_HEADERS})

 add_custom_command(TARGET install-simgrid
 add_custom_command(TARGET install-simgrid

-       COMMAND echo "install doc/examples  OK"
+       COMMAND echo "install include       OK"

        WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
 )
 
        WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
 )
 


@@ -129,7 +132,7 @@ if(HAVE_LUA)
 endif(HAVE_LUA)
 
 if(HAVE_RUBY)
 endif(HAVE_LUA)
 
 if(HAVE_RUBY)

-       string(REGEX REPLACE "^.*ruby/" "" install_link_ruby "${RUBY_INCLUDE_PATH}")
+       string(REGEX REPLACE "^.*ruby/" "" install_link_ruby "${RUBY_ARCH_DIR}")

        add_custom_command(TARGET install-simgrid
        COMMAND mkdir -p "$ENV{DESTDIR}${prefix}/lib/ruby/${install_link_ruby}/"
        COMMAND ln -sf ${prefix}/lib/libsimgrid.so $ENV{DESTDIR}${prefix}/lib/ruby/${install_link_ruby}/libsimgrid.so
        add_custom_command(TARGET install-simgrid
        COMMAND mkdir -p "$ENV{DESTDIR}${prefix}/lib/ruby/${install_link_ruby}/"
        COMMAND ln -sf ${prefix}/lib/libsimgrid.so $ENV{DESTDIR}${prefix}/lib/ruby/${install_link_ruby}/libsimgrid.so


@@ -145,6 +148,29 @@ if(HAVE_RUBY)
        )
 endif(HAVE_RUBY)
 
        )
 endif(HAVE_RUBY)
 

+foreach(file ${directory_to_create})
+       string(REPLACE "${PROJECT_DIRECTORY}" "." file "${file}")
+       add_custom_command(TARGET install-simgrid
+               COMMAND mkdir -p $ENV{DESTDIR}${prefix}/doc/simgrid/${file}
+               WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
+       )
+endforeach(file ${directory_to_create})
+
+foreach(file ${ex_to_svg})
+       string(REPLACE "${PROJECT_DIRECTORY}" "." file "${file}")
+       add_custom_command(TARGET install-simgrid
+               COMMAND cp ${file} $ENV{DESTDIR}${prefix}/doc/simgrid/${file}
+               WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
+       )
+endforeach(file ${ex_to_svg})
+
+add_custom_command(TARGET install-simgrid
+       COMMAND echo "install doc/examples  OK"
+       COMMAND cp ${PROJECT_DIRECTORY}/doc/html/* $ENV{DESTDIR}${prefix}/doc/simgrid/html/
+       COMMAND echo "install doc/html      OK"
+       WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
+)
+

 add_custom_target(html
 COMMAND echo "Make the html doc"
 COMMAND echo "cmake -DBIBTEX2HTML=${BIBTEX2HTML} ./"
 add_custom_target(html
 COMMAND echo "Make the html doc"
 COMMAND echo "cmake -DBIBTEX2HTML=${BIBTEX2HTML} ./"