Fix Bibtex2html pb.

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

diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index 632cbee..180cd95 100644 (file)
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -93,7 +93,8 @@ COMMAND echo "TODO"
 
 add_custom_target(html
 COMMAND echo "Make the html doc"
 
 add_custom_target(html
 COMMAND echo "Make the html doc"

-COMMAND cmake ./
+COMMAND echo "cmake -DBIBTEX2HTML=${BIBTEX2HTML} ./"
+COMMAND cmake -DBIBTEX2HTML=${BIBTEX2HTML} ./

 COMMAND rm -rf ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/CMakeFiles
 COMMAND rm ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/CMakeCache.txt
 COMMAND rm ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/cmake_install.cmake
 COMMAND rm -rf ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/CMakeFiles
 COMMAND rm ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/CMakeCache.txt
 COMMAND rm ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/cmake_install.cmake

diff --git a/buildtools/Cmake/src/CMakeDocs.txt b/buildtools/Cmake/src/CMakeDocs.txt
index 0ddb800..ae4323e 100644 (file)
--- a/buildtools/Cmake/src/CMakeDocs.txt
+++ b/buildtools/Cmake/src/CMakeDocs.txt
@@ -1,5 +1,12 @@
 SET(MAKE_DOC false)
 SET(MAKE_DOC false)

+
+if(BIBTEX2HTML)
+set(BIBTEX2HTML_PATH ${BIBTEX2HTML})
+else(BIBTEX2HTML)

 find_path(BIBTEX2HTML_PATH     NAMES bibtex2html       PATHS NO_DEFAULT_PATHS)
 find_path(BIBTEX2HTML_PATH     NAMES bibtex2html       PATHS NO_DEFAULT_PATHS)

+endif(BIBTEX2HTML)
+message("BIBTEX2HTML_PATH ${BIBTEX2HTML_PATH}")
+message("BIBTEX2HTML ${BIBTEX2HTML}")

 
 if(BIBTEX2HTML_PATH)
        exec_program("${BIBTEX2HTML_PATH}/bibtex2html -version" OUTPUT_VARIABLE SORTIE_BIBTEX2HTML_VERSION)
 
 if(BIBTEX2HTML_PATH)
        exec_program("${BIBTEX2HTML_PATH}/bibtex2html -version" OUTPUT_VARIABLE SORTIE_BIBTEX2HTML_VERSION)

diff --git a/buildtools/Cmake/src/CMakeOption.txt b/buildtools/Cmake/src/CMakeOption.txt
index bc423e3..990afa4 100644 (file)
--- a/buildtools/Cmake/src/CMakeOption.txt
+++ b/buildtools/Cmake/src/CMakeOption.txt
@@ -1,6 +1,7 @@
 ### ARGs use -D[var]=[ON/OFF] or [1/0] or [true/false](see after)
 ### ex: cmake -Ddisable_java=ON -Ddisable_gtnets=ON ./
 
 ### ARGs use -D[var]=[ON/OFF] or [1/0] or [true/false](see after)
 ### ex: cmake -Ddisable_java=ON -Ddisable_gtnets=ON ./
 

+set(BIBTEX2HTML ${BIBTEX2HTML} CACHE PATH "Path to bibtex2html")

 set(gtnets_path ${gtnets_path} CACHE PATH "Path to gtnets lib")
 set(prefix ${prefix} CACHE PATH "Path where to install project")
 set(with_context ${with_context} CACHE TYPE INTERNAL FORCE)
 set(gtnets_path ${gtnets_path} CACHE PATH "Path to gtnets lib")
 set(prefix ${prefix} CACHE PATH "Path where to install project")
 set(with_context ${with_context} CACHE TYPE INTERNAL FORCE)


@@ -9,6 +10,7 @@ if(NOT with_context)
        set(with_context "auto" CACHE TYPE INTERNAL FORCE)
 endif(NOT with_context)
 
        set(with_context "auto" CACHE TYPE INTERNAL FORCE)
 endif(NOT with_context)
 

+

 option(disable_java "This variable set the java context." off)
 option(disable_lua "This variable set lua use." off)
 option(disable_gtnets "This variable set the gtnets context." off)
 option(disable_java "This variable set the java context." off)
 option(disable_lua "This variable set lua use." off)
 option(disable_gtnets "This variable set the gtnets context." off)


@@ -22,6 +24,7 @@ option(supernovae "Supernovae mode." off)
 option(tracing "Tracing mode." off)
 option(print_message "Enable print message during config." off)
 
 option(tracing "Tracing mode." off)
 option(print_message "Enable print message during config." off)
 

+mark_as_advanced(BIBTEX2HTML_PATH)

 mark_as_advanced(LUA_LIB_PATH_1)                                                                                                                      
 mark_as_advanced(LUA_LIB_PATH_2)
 mark_as_advanced(LUA_LIB_PATH_3)
 mark_as_advanced(LUA_LIB_PATH_1)                                                                                                                      
 mark_as_advanced(LUA_LIB_PATH_2)
 mark_as_advanced(LUA_LIB_PATH_3)

diff --git a/buildtools/Cmake/src/doc/CMakeLists.txt b/buildtools/Cmake/src/doc/CMakeLists.txt
index 64b4cf1..16c96ff 100644 (file)
--- a/buildtools/Cmake/src/doc/CMakeLists.txt
+++ b/buildtools/Cmake/src/doc/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.6)
 SET(PROJECT_NAME "Simgrid_doc")
 
 find_program(PWD_EXE NAMES pwd)
 SET(PROJECT_NAME "Simgrid_doc")
 
 find_program(PWD_EXE NAMES pwd)

+set(BIBTEX2HTML ${BIBTEX2HTML} CACHE TYPE INTERNAL FORCE)

 
 ### AUTO DETECT THE PROJECT_DIRECTORY
 exec_program("${PWD_EXE}" OUTPUT_VARIABLE PROJECT_DIRECTORY)
 
 ### AUTO DETECT THE PROJECT_DIRECTORY
 exec_program("${PWD_EXE}" OUTPUT_VARIABLE PROJECT_DIRECTORY)