Add install to cmake.

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

diff --git a/buildtools/CPACK/simgrid_CMakeList/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/CMakeLists.txt
index b9b8915..374b3fe 100644 (file)
--- a/buildtools/CPACK/simgrid_CMakeList/CMakeLists.txt
+++ b/buildtools/CPACK/simgrid_CMakeList/CMakeLists.txt
@@ -37,6 +37,8 @@ include(${PROJECT_DIRECTORY}/CPACK/src/CMakeCompleteInFiles.txt)
 ### Define source packages for Libs 
 include(${PROJECT_DIRECTORY}/CPACK/src/CMakeDefinePackages.txt)
 
 ### Define source packages for Libs 
 include(${PROJECT_DIRECTORY}/CPACK/src/CMakeDefinePackages.txt)
 

+include(${PROJECT_DIRECTORY}/CPACK/src/CMakeFLEXml.txt)
+

 ### Setup gcc flags
 include(${PROJECT_DIRECTORY}/CPACK/src/CMakeFlags.txt)
 
 ### Setup gcc flags
 include(${PROJECT_DIRECTORY}/CPACK/src/CMakeFlags.txt)
 

diff --git a/buildtools/CPACK/src/CMakeDefinePackages.txt b/buildtools/CPACK/src/CMakeDefinePackages.txt
index 1ebc363..da924b3 100644 (file)
--- a/buildtools/CPACK/src/CMakeDefinePackages.txt
+++ b/buildtools/CPACK/src/CMakeDefinePackages.txt
@@ -1,77 +1,5 @@
 ### define source packages
 
 ### define source packages
 

-SET(CMakeSources
-${PROJECT_DIRECTORY}/CPACK/clean_first.sh
-${PROJECT_DIRECTORY}/CPACK/start.sh
-${PROJECT_DIRECTORY}/CPACK/README
-)
-
-SET(CMAKELISTS_TXT
-${PROJECT_DIRECTORY}/CMakeLists.txt
-#testsuite/xbt
-${PROJECT_DIRECTORY}/testsuite/xbt/CMakeLists.txt
-#testsuite/surf
-${PROJECT_DIRECTORY}/testsuite/surf/CMakeLists.txt
-#testsuite/simdag
-${PROJECT_DIRECTORY}/testsuite/simdag/CMakeLists.txt
-#tools/tesh
-${PROJECT_DIRECTORY}/tools/tesh/CMakeLists.txt
-#tools/gras
-${PROJECT_DIRECTORY}/tools/gras/CMakeLists.txt
-#teshsuite
-${PROJECT_DIRECTORY}/teshsuite/xbt/CMakeLists.txt
-${PROJECT_DIRECTORY}/teshsuite/gras/datadesc/CMakeLists.txt
-${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle/CMakeLists.txt
-${PROJECT_DIRECTORY}/teshsuite/simdag/CMakeLists.txt
-${PROJECT_DIRECTORY}/teshsuite/simdag/network/CMakeLists.txt
-${PROJECT_DIRECTORY}/teshsuite/simdag/network/p2p/CMakeLists.txt
-${PROJECT_DIRECTORY}/teshsuite/simdag/network/mxn/CMakeLists.txt
-${PROJECT_DIRECTORY}/teshsuite/simdag/partask/CMakeLists.txt
-${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/CMakeLists.txt
-${PROJECT_DIRECTORY}/teshsuite/msg/CMakeLists.txt
-#examples
-${PROJECT_DIRECTORY}/examples/gras/ping/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/gras/rpc/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/gras/spawn/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/gras/timer/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/gras/chrono/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/gras/mmrpc/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/gras/all2all/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/gras/pmm/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/gras/synchro/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/gras/properties/CMakeLists.txt
-
-${PROJECT_DIRECTORY}/examples/msg/properties/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/msg/actions/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/msg/migration/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/msg/sendrecv/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/msg/suspend/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/msg/parallel_task/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/msg/priority/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/msg/masterslave/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/msg/trace/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/msg/gtnets/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/amok/bandwith/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/amok/saturate/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/simdag/dax/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/simdag/metaxml/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/simdag/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/simdag/properties/CMakeLists.txt
-${PROJECT_DIRECTORY}/examples/smpi/CMakeLists.txt
-)
-
-SET(CMakeSources_src
-${PROJECT_DIRECTORY}/CPACK/src/CMakeCompleteInFiles.txt
-${PROJECT_DIRECTORY}/CPACK/src/CMakeDefinePackages.txt
-${PROJECT_DIRECTORY}/CPACK/src/CMakeDistrib.txt
-${PROJECT_DIRECTORY}/CPACK/src/CMakeTest.txt
-${PROJECT_DIRECTORY}/CPACK/src/CTestConfig.cmake
-${PROJECT_DIRECTORY}/CPACK/src/test_gras_config.h.in
-)
-
-include(${PROJECT_DIRECTORY}/CPACK/src/CMakeFLEXml.txt)
-

 set(EXTRA_DIST 
        ${PROJECT_DIRECTORY}/src/portable.h
        ${PROJECT_DIRECTORY}/src/xbt/mallocator_private.h
 set(EXTRA_DIST 
        ${PROJECT_DIRECTORY}/src/portable.h
        ${PROJECT_DIRECTORY}/src/xbt/mallocator_private.h


@@ -277,10 +205,6 @@ set(SURF_SRC
        ${PROJECT_DIRECTORY}/src/xbt/xbt_sg_stubs.c
 )
 
        ${PROJECT_DIRECTORY}/src/xbt/xbt_sg_stubs.c
 )
 

-SET_SOURCE_FILES_PROPERTIES(${SURF_SRC}
-PROPERTIES PRIORITY high
-)
-

 set(SIMIX_SRC 
        ${PROJECT_DIRECTORY}/src/simix/smx_global.c
        ${PROJECT_DIRECTORY}/src/simix/smx_deployment.c
 set(SIMIX_SRC 
        ${PROJECT_DIRECTORY}/src/simix/smx_global.c
        ${PROJECT_DIRECTORY}/src/simix/smx_deployment.c

diff --git a/buildtools/CPACK/src/CMakeDistrib.txt b/buildtools/CPACK/src/CMakeDistrib.txt
index e02ac46..9f37039 100644 (file)
--- a/buildtools/CPACK/src/CMakeDistrib.txt
+++ b/buildtools/CPACK/src/CMakeDistrib.txt
@@ -1,116 +1,48 @@
 cmake_minimum_required(VERSION 2.6)
 
 cmake_minimum_required(VERSION 2.6)
 

-### Make the distrib
-
-install(TARGETS simgrid        DESTINATION "lib/")
-install(TARGETS gras   DESTINATION "lib/")
-
-install(
-DIRECTORY "${PROJECT_DIRECTORY}/include/" 
-DESTINATION "include/" 
-PATTERN ".svn" EXCLUDE 
-PATTERN ".git" EXCLUDE 
-PATTERN "*~" EXCLUDE
-)
-install(
-DIRECTORY "${PROJECT_DIRECTORY}/src/" 
-DESTINATION "src/"
-PATTERN ".svn" EXCLUDE 
-PATTERN ".git" EXCLUDE 
-PATTERN ".gitignore" EXCLUDE
-PATTERN "*~" EXCLUDE
-)
-install(
-DIRECTORY "${PROJECT_DIRECTORY}/CPACK/" 
-DESTINATION "CPACK/" 
-PATTERN "*~" EXCLUDE
-)
-
-install(
-DIRECTORY
-${PROJECT_DIRECTORY}/testsuite
-${PROJECT_DIRECTORY}/teshsuite
-${PROJECT_DIRECTORY}/tools
-${PROJECT_DIRECTORY}/examples
-DESTINATION "./" 
-PATTERN "*~" EXCLUDE
-PATTERN "*.am" EXCLUDE
-PATTERN "*.ac" EXCLUDE
-PATTERN "*~" EXCLUDE
-PATTERN ".svn" EXCLUDE 
-PATTERN ".git" EXCLUDE 
-PATTERN ".gitignore" EXCLUDE
-)
-
-#./
-install(FILES ${PROJECT_DIRECTORY}/CMakeLists.txt DESTINATION simgrid_CMakeList)
-
-#testsuite/xbt
-install(FILES ${PROJECT_DIRECTORY}/testsuite/xbt/CMakeLists.txt DESTINATION simgrid_CMakeList/testsuite/xbt)
-
-#testsuite/surf
-install(FILES ${PROJECT_DIRECTORY}/testsuite/surf/CMakeLists.txt DESTINATION simgrid_CMakeList/testsuite/surf)
-
-#testsuite/simdag
-install(FILES ${PROJECT_DIRECTORY}/testsuite/simdag/CMakeLists.txt DESTINATION simgrid_CMakeList/testsuite/simdag)
-
-#tools
-#tools/tesh
-install(FILES ${PROJECT_DIRECTORY}/tools/tesh/CMakeLists.txt DESTINATION simgrid_CMakeList/tools/tesh)
-
-#tools/gras
-install(FILES ${PROJECT_DIRECTORY}/tools/gras/CMakeLists.txt DESTINATION simgrid_CMakeList/tools/gras)
-
-#teshsuite
-install(FILES ${PROJECT_DIRECTORY}/teshsuite/xbt/CMakeLists.txt DESTINATION simgrid_CMakeList/teshsuite/xbt)
-install(FILES ${PROJECT_DIRECTORY}/teshsuite/gras/datadesc/CMakeLists.txt DESTINATION simgrid_CMakeList/teshsuite/gras/datadesc)
-install(FILES ${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle/CMakeLists.txt DESTINATION simgrid_CMakeList/teshsuite/gras/msg_handle)
-install(FILES ${PROJECT_DIRECTORY}/teshsuite/simdag/CMakeLists.txt DESTINATION simgrid_CMakeList/teshsuite/simdag)
-install(FILES ${PROJECT_DIRECTORY}/teshsuite/simdag/network/CMakeLists.txt DESTINATION simgrid_CMakeList/teshsuite/simdag/network)
-install(FILES ${PROJECT_DIRECTORY}/teshsuite/simdag/network/p2p/CMakeLists.txt DESTINATION simgrid_CMakeList/teshsuite/simdag/network/p2p)
-install(FILES ${PROJECT_DIRECTORY}/teshsuite/simdag/network/mxn/CMakeLists.txt DESTINATION simgrid_CMakeList/teshsuite/simdag/network/mxn)
-install(FILES ${PROJECT_DIRECTORY}/teshsuite/simdag/partask/CMakeLists.txt DESTINATION simgrid_CMakeList/teshsuite/simdag/partask)
-install(FILES ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/CMakeLists.txt DESTINATION simgrid_CMakeList/teshsuite/simdag/platforms)
-install(FILES ${PROJECT_DIRECTORY}/teshsuite/msg/CMakeLists.txt DESTINATION simgrid_CMakeList/teshsuite/msg)
-
-#examples
-install(FILES ${PROJECT_DIRECTORY}/examples/gras/ping/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/gras/ping)
-install(FILES ${PROJECT_DIRECTORY}/examples/gras/rpc/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/gras/rpc)
-install(FILES ${PROJECT_DIRECTORY}/examples/gras/spawn/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/gras/spawn)
-install(FILES ${PROJECT_DIRECTORY}/examples/gras/timer/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/gras/timer)
-install(FILES ${PROJECT_DIRECTORY}/examples/gras/chrono/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/gras/chrono)
-install(FILES ${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/gras/mutual_exclusion/simple_token)
-install(FILES ${PROJECT_DIRECTORY}/examples/gras/mmrpc/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/gras/mmrpc)
-install(FILES ${PROJECT_DIRECTORY}/examples/gras/all2all/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/gras/all2all)
-install(FILES ${PROJECT_DIRECTORY}/examples/gras/pmm/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/gras/pmm)
-install(FILES ${PROJECT_DIRECTORY}/examples/gras/synchro/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/gras/synchro)
-install(FILES ${PROJECT_DIRECTORY}/examples/gras/properties/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/gras/properties)
-
-install(FILES ${PROJECT_DIRECTORY}/examples/msg/properties/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/msg/properties)
-install(FILES ${PROJECT_DIRECTORY}/examples/msg/actions/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/msg/actions)
-install(FILES ${PROJECT_DIRECTORY}/examples/msg/migration/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/msg/migration)
-install(FILES ${PROJECT_DIRECTORY}/examples/msg/sendrecv/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/msg/sendrecv)
-install(FILES ${PROJECT_DIRECTORY}/examples/msg/suspend/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/msg/suspend)
-install(FILES ${PROJECT_DIRECTORY}/examples/msg/parallel_task/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/msg/parallel_task)
-install(FILES ${PROJECT_DIRECTORY}/examples/msg/priority/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/msg/priority)
-install(FILES ${PROJECT_DIRECTORY}/examples/msg/masterslave/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/msg/masterslave)
-install(FILES ${PROJECT_DIRECTORY}/examples/msg/trace/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/msg/trace)
-if(HAVE_GTNETS)
-       install(FILES ${PROJECT_DIRECTORY}/examples/msg/gtnets/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/msg/gtnets)
-endif(HAVE_GTNETS)
-
-install(FILES ${PROJECT_DIRECTORY}/examples/amok/bandwidth/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/amok/bandwidth)
-install(FILES ${PROJECT_DIRECTORY}/examples/amok/saturate/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/amok/saturate)
-install(FILES ${PROJECT_DIRECTORY}/examples/simdag/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/simdag)
-install(FILES ${PROJECT_DIRECTORY}/examples/simdag/dax/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/simdag/dax)
-install(FILES ${PROJECT_DIRECTORY}/examples/simdag/metaxml/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/simdag/metaxml)
-install(FILES ${PROJECT_DIRECTORY}/examples/simdag/properties/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/simdag/properties)
-
-install(FILES ${PROJECT_DIRECTORY}/examples/smpi/CMakeLists.txt DESTINATION simgrid_CMakeList/examples/smpi)
+set(prefix "/home/navarrop/Bureau/test_install/")
+set(CPACK_SET_DESTDIR on)
+set(simgrid_version "3.3.5")

 
 set(CMAKE_PROJECT_NAME "${PROJECT_NAME}")
 set(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
 set(CPACK_PROJECT_NAME "${PROJECT_NAME}")
 
 set(CMAKE_PROJECT_NAME "${PROJECT_NAME}")
 set(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
 set(CPACK_PROJECT_NAME "${PROJECT_NAME}")

-set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}_rev_${SVN_VERSION}")
+set(CPACK_PACKAGE_FILE_NAME "simgrid-${simgrid_version}_rev_${SVN_VERSION}")

 set(CPACK_GENERATOR "TBZ2") #;TGZ;TZ;ZIP
 set(CPACK_GENERATOR "TBZ2") #;TGZ;TZ;ZIP

+       
+if(distrib)
+       
+       set(CMAKE_INSTALL_PREFIX .)
+
+       ###copy doc
+       install(DIRECTORY "${PROJECT_DIRECTORY}/doc/"
+       DESTINATION "doc/"
+       )
+
+elseif(distrib)
+
+       set(CMAKE_INSTALL_PREFIX ${prefix})
+
+       ###install libs
+       install(DIRECTORY "${PROJECT_DIRECTORY}/src/.libs/"
+       DESTINATION "lib/"
+       )
+
+       ###install include
+       install(
+       DIRECTORY "${PROJECT_DIRECTORY}/include/" 
+       DESTINATION "include/" 
+       PATTERN ".svn" EXCLUDE 
+       PATTERN ".git" EXCLUDE 
+       PATTERN "*~" EXCLUDE
+       )
+
+       ###install doc
+       install(
+       DIRECTORY "${PROJECT_DIRECTORY}/doc/html/" 
+       DESTINATION "doc/simgrid/html" 
+       )       
+
+endif(distrib)
+

 include(CPack)
 include(CPack)

diff --git a/buildtools/CPACK/src/CMakeOption.txt b/buildtools/CPACK/src/CMakeOption.txt
index 4f0c206..518eefe 100644 (file)
--- a/buildtools/CPACK/src/CMakeOption.txt
+++ b/buildtools/CPACK/src/CMakeOption.txt
@@ -18,3 +18,4 @@ option(enable_compile_warnings "" OFF)
 option(enable_compile_optimizations "" OFF)
 option(disable_gtnets "This variable set the gtnets context." OFF)
 option(disable_ruby "This variable set ruby use." ON)
 option(enable_compile_optimizations "" OFF)
 option(disable_gtnets "This variable set the gtnets context." OFF)
 option(disable_ruby "This variable set ruby use." ON)

+option(distrib "Set on if you want make a distribution." ON)

diff --git a/buildtools/CPACK/src/CMakePrintArgs.txt b/buildtools/CPACK/src/CMakePrintArgs.txt
index 0630489..93bc143 100644 (file)
--- a/buildtools/CPACK/src/CMakePrintArgs.txt
+++ b/buildtools/CPACK/src/CMakePrintArgs.txt
@@ -28,7 +28,8 @@ message("")
 message("      Simgrid dependencies:   ${SIMGRID_DEP}")
 message("      Gras dependencies:      ${GRAS_DEP}")
 message("      Ruby dependencies:      ${RUBY_DEP}")
 message("      Simgrid dependencies:   ${SIMGRID_DEP}")
 message("      Gras dependencies:      ${GRAS_DEP}")
 message("      Ruby dependencies:      ${RUBY_DEP}")

-message("      Smpi dependencies:      ${SMPI_DEP}\n\n")
-
-
+message("      Smpi dependencies:      ${SMPI_DEP}")
+message("")
+message("      Distrib_mode:           ${distrib}")
+message("      INSTALL_PREFIX:         ${CMAKE_INSTALL_PREFIX}")

 
 

diff --git a/buildtools/CPACK/src/CTestConfig.cmake b/buildtools/CPACK/src/CTestConfig.cmake
index 9177177..6233593 100644 (file)
--- a/buildtools/CPACK/src/CTestConfig.cmake
+++ b/buildtools/CPACK/src/CTestConfig.cmake
@@ -48,9 +48,9 @@ if(supernovae)
        SET(BUILDNAME "SUPERNOVAE" CACHE TYPE INTERNAL FORCE)
 endif(supernovae)
 
        SET(BUILDNAME "SUPERNOVAE" CACHE TYPE INTERNAL FORCE)
 endif(supernovae)
 

-if(NOT disable_gtnets)
+if(NOT disable_gtnets AND HAVE_GTNETS)

        SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE)
        SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE)

-endif(NOT disable_gtnets)
+endif(NOT disable_gtnets AND HAVE_GTNETS)

 
 SET(SITE "${osname}_${DISTRIB2}_${cpu}")
 SET(CTEST_SITE "${osname}_${DISTRIB2}_${cpu}")
 
 SET(SITE "${osname}_${DISTRIB2}_${cpu}")
 SET(CTEST_SITE "${osname}_${DISTRIB2}_${cpu}")