nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@539 331e1502-861f-0410-8da2-ba01fb791d7f

Browse source
This commit is contained in:
legrand 2007-07-05 09:39:21 +00:00
commit 4b1ae825bd
4 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

35
trunk/installParadiseo.sh
View file

@ -24,8 +24,8 @@ P_EXIT_INSTALL=5
IS_MPICH_INSTALLED=1
IS_LIBXML2_INSTALLED=1
USE_EXISTING_MPICH=1
USE_EXISTING_LIBXML2=1
USE_EXISTING_MPICH=-1
USE_EXISTING_LIBXML2=-1
# install steps
S_INTRODUCTION=1000
@ -768,7 +768,6 @@ function run_install_step()
#------------------------------------------------------#
function check_utils_install
{
# is there an available version of mpich on the system ?
(mpicxx --version) < /dev/null > /dev/null 2>&1 ||
{
@ -806,8 +805,6 @@ function check_utils_install
TREATENED=1
fi
done
else
echo $IS_MPICH_INSTALLED
fi
@ -919,18 +916,20 @@ do
if [ "$USE_EXISTING_MPICH" = "1" ] && [ "$USE_EXISTING_LIBXML2" = "1" ]
then
THE_GOOD_INSTALL=$FULL_INSTALL_WITHOUT_LIBXML2_MPICH2
fi
if [ "$USE_EXISTING_MPICH" = "1" ] && [ "$USE_EXISTING_LIBXML2" = "0" ]
elif [ "$USE_EXISTING_MPICH" = "1" ] && [ "$USE_EXISTING_LIBXML2" = "0" ]
then
THE_GOOD_INSTALL=$FULL_INSTALL_WITHOUT_MPICH
fi
if [ "$USE_EXISTING_MPICH" = "0" ] && [ "$USE_EXISTING_LIBXML2" = "1" ]
elif [ "$USE_EXISTING_MPICH" = "0" ] && [ "$USE_EXISTING_LIBXML2" = "1" ]
then
THE_GOOD_INSTALL=$FULL_INSTALL_WITHOUT_LIBXML2
fi
if [ "$USE_EXISTING_MPICH" = "0" ] && [ "$USE_EXISTING_LIBXML2" = "0" ]
elif [ "$USE_EXISTING_MPICH" = "0" ] && [ "$USE_EXISTING_LIBXML2" = "0" ]
then
THE_GOOD_INSTALL=$FULL_INSTALL
else
THE_GOOD_INSTALL=$FULL_INSTALL
fi
counter=0
@ -961,18 +960,20 @@ do
if [ "$USE_EXISTING_MPICH" = "1" ] && [ "$USE_EXISTING_LIBXML2" = "1" ]
then
THE_GOOD_PARALLEL_INSTALL=$PARALLEL_INSTALL_WITHOUT_LIBXML2_MPICH2
fi
if [ "$USE_EXISTING_MPICH" = "1" ] && [ "$USE_EXISTING_LIBXML2" = "0" ]
elif [ "$USE_EXISTING_MPICH" = "1" ] && [ "$USE_EXISTING_LIBXML2" = "0" ]
then
THE_GOOD_PARALLEL_INSTALL=$PARALLEL_INSTALL_WITHOUT_MPICH2
fi
if [ "$USE_EXISTING_MPICH" = "0" ] && [ "$USE_EXISTING_LIBXML2" = "1" ]
elif [ "$USE_EXISTING_MPICH" = "0" ] && [ "$USE_EXISTING_LIBXML2" = "1" ]
then
THE_GOOD_PARALLEL_INSTALL=$PARALLEL_INSTALL_WITHOUT_LIBXML2
fi
if [ "$USE_EXISTING_MPICH" = "0" ] && [ "$USE_EXISTING_LIBXML2" = "0" ]
elif [ "$USE_EXISTING_MPICH" = "0" ] && [ "$USE_EXISTING_LIBXML2" = "0" ]
then
THE_GOOD_PARALLEL_INSTALL=$PARALLEL_INSTALL
else
THE_GOOD_PARALLEL_INSTALL=$PARALLEL_INSTALL
fi
counter=0

6
trunk/paradiseo-peo/CMakeLists.txt
View file

@ -4,14 +4,14 @@
######################################################################################
IF(WIN32)
#MESSAGE (FATAL_ERROR "ParadisEO-PEO can not be generated on Windows systems")
MESSAGE (FATAL_ERROR "ParadisEO-PEO can not be generated on Windows systems")
ENDIF(WIN32)
# check libxml2
FIND_PROGRAM(XML2_CONFIG_PROGRAM NAMES xml2-config PATHS /usr/local/bin /usr/bin DOC "The libxml2 (www.xmlsoft.org) configuration tool")
IF(NOT XML2_CONFIG_PROGRAM)
MESSAGE(FATAL_ERROR "Libxml2 cannot be found on your system. Libxml2 is required for ParadisEO-PEO install")
#MESSAGE(FATAL_ERROR "Libxml2 cannot be found on your system. Libxml2 is required for ParadisEO-PEO install")
ENDIF(NOT XML2_CONFIG_PROGRAM)
# set libxml2 cflags in XML2_CFLAGS
@ -145,6 +145,6 @@ ENDIF(NOT ${MO_DIR} MATCHES "${ABSOLUTE_PATH_REGEX}")
### 6) Where must cmake go now ?
######################################################################################
SUBDIRS(doc src ) #tutorial)
SUBDIRS(doc src tutorial)
######################################################################################

1
trunk/paradiseo-peo/tutorial/Lesson3/CMakeLists.txt
View file

@ -43,7 +43,6 @@ ADD_DEPENDENCIES(tspExample tsp)
ADD_DEPENDENCIES(tspExample peo)
ADD_DEPENDENCIES(tspExample rmc_mpi)
SET(EXECUTABLE_OUTPUT_PATH ${TUTORIAL_LESSON3_DIR}/build)
######################################################################################

3
trunk/paradiseo-peo/tutorial/Walkthrough/CMakeLists.txt
View file

@ -35,7 +35,7 @@ INCLUDE_DIRECTORIES(${TSP_SRC_DIR})
LINK_DIRECTORIES( ${EO_SRC_DIR}
${EO_SRC_DIR}/utils
${PEO_DIR}/build
${TSP_EXAMPLE_DIR}/build)
${TSP_BINARY_DIR}/lib)
######################################################################################
@ -69,7 +69,6 @@ ADD_DEPENDENCIES(exampleC rmc_mpi)
ADD_DEPENDENCIES(exampleD rmc_mpi)
ADD_DEPENDENCIES(exampleE rmc_mpi)
SET(EXECUTABLE_OUTPUT_PATH ${TUTORIAL_WALKTHROUGH_DIR}/build)
######################################################################################