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

Update module for Windows. Fix some troubles during the installation and package creation

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2712 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
quemy 2012-07-19 08:59:51 +00:00
commit 71864c2a6e
20 changed files with 72 additions and 783 deletions
Download patch file Download diff file Expand all files Collapse all files

22
branches/rc2.0/cmake/module/FindParadiseo.cmake
View file

@ -30,7 +30,9 @@
# add_executable(example ...)
# target_link_libraries(examplep ${PARADISEO_LIBRARIES})
if(UNIX)
set(INSTALL_SUB_DIR /paradiseo)
endif()
# enabled components
if ("${Paradiseo_FIND_COMPONENTS}" STREQUAL "")
@ -40,9 +42,7 @@ else()
endif()
#set the build directory
if(NOT DEFINED ${BUILD_DIR})
set(BUILD_DIR build)
endif()
set(BUILD_DIR build)
# Path
set(PARADISEO_SRC_PATHS
@ -54,20 +54,20 @@ set(PARADISEO_SRC_PATHS
/opt/local/ # DarwinPorts
/opt/csw/ # Blastwave
/opt/
#KEY_CURRENT_USER\Software
#HKEY_LOCAL_MACHINE\Software
[KEY_CURRENT_USER\\Software\\Inria\\ParadisEO]
[HKEY_LOCAL_MACHINE\\Software\\Inria\\ParadiseEO]
)
find_path(EO_INCLUDE_DIR eo
PATH_SUFFIXES include eo/src
PATH_SUFFIXES include${INSTALL_SUB_DIR}/eo eo/src
PATHS ${PARADISEO_SRC_PATHS})
find_path(MO_INCLUDE_DIR mo
PATH_SUFFIXES include mo/src
PATH_SUFFIXES include${INSTALL_SUB_DIR}/mo mo/src
PATHS ${PARADISEO_SRC_PATHS})
find_path(MOEO_INCLUDE_DIR moeo
PATH_SUFFIXES include moeo/src
PATH_SUFFIXES include${INSTALL_SUB_DIR}/moeo moeo/src
PATHS ${PARADISEO_SRC_PATHS})
set(PARADISEO_INCLUDE_DIR ${EO_INCLUDE_DIR} ${MO_INCLUDE_DIR} ${MOEO_INCLUDE_DIR})
@ -84,8 +84,8 @@ set(FIND_PARADISEO_LIB_PATHS
/opt/local/ # DarwinPorts
/opt/csw/ # Blastwave
/opt/
#KEY_CURRENT_USER\Software
#HKEY_LOCAL_MACHINE\Software
[KEY_CURRENT_USER\\Software\\Inria\\ParadisEO]
[HKEY_LOCAL_MACHINE\\Software\\Inria\\ParadiseEO]
)
#Suffixes