git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@539 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
parent
108e954c22
commit
4b1ae825bd
4 changed files with 22 additions and 23 deletions
|
|
@ -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)
|
||||
|
||||
######################################################################################
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
######################################################################################
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
######################################################################################
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue