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

8
branches/rc2.0/cmake/Config.cmake
View file

@ -22,21 +22,20 @@ if("${SIZEOF_VOID_PTR}" STREQUAL "4")
set(ARCH x86)
set(LIB lib32)
elseif("${SIZEOF_VOID_PTR}" STREQUAL "8")
set(ARCH x64)
set(ARCH x86_64)
set(LIB lib64)
else()
message(FATAL_ERROR "Unsupported architecture")
return()
endif()
######################################################################################
### 0) Define general CXX flags for DEBUG and RELEASE
######################################################################################
add_definitions(-DDEPRECATED_MESSAGES)
set(CMAKE_CXX_FLAGS_DEBUG "-Wunknown-pragmas -O0 -g -Wall -Wextra -ansi -pedantic -fopenmp -std=c++0x" CACHE STRING "" FORCE)
set(CMAKE_CXX_FLAGS_RELEASE "-Wunknown-pragmas -O3 -fopenmp -std=c++0x" CACHE STRING "" FORCE)
set(CMAKE_CXX_FLAGS_RELEASE "-Wunknown-pragmas -O2 -fopenmp -std=c++0x" CACHE STRING "" FORCE)
######################################################################################
### 1) Define installation type
@ -66,7 +65,6 @@ endif(PROFILING)
if(ENABLE_CMAKE_TESTING)
enable_testing()
include(CTest REQUIRED)
set(DEBUG "true" CACHE STRING "" FORCE)
endif(ENABLE_CMAKE_TESTING)
######################################################################################
@ -75,7 +73,7 @@ endif(ENABLE_CMAKE_TESTING)
if(NOT DEFINED DEBUG)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
else( NOT DEFINED DEBUG OR DEFINED PREFIX )
else( NOT DEFINED DEBUG)
set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "" FORCE)
endif(NOT DEFINED DEBUG)

16
branches/rc2.0/cmake/Package.cmake
View file

@ -61,7 +61,7 @@ set(CPACK_PACKAGE_EXECUTABLES "${PROJECT_NAME}" "${PROJECT_NAME}")
set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME} ${VERSION_MAJOR}.${VERSION_MINOR}")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}")
set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${ARCH}")
if(UNIX)
@ -75,13 +75,25 @@ if(UNIX)
else()
# Generators for Unix-like
set(CPACK_GENERATOR "DEB;RPM")
set(CPACK_GENERATOR "DEB;RPM")
# Determine architecture
include(CheckTypeSize)
check_type_size(void* SIZEOF_VOID_PTR)
if("${SIZEOF_VOID_PTR}" STREQUAL "4")
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386)
elseif("${SIZEOF_VOID_PTR}" STREQUAL "8")
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE amd64)
else()
message(FATAL_ERROR "Unsupported architecture")
return()
endif()
endif()
else(UNIX)
# Generator for Windows
set(CPACK_GENERATOR "NSIS")
#set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/winicon.bpm")
endif()

6
branches/rc2.0/cmake/Target.cmake
View file

@ -33,9 +33,9 @@ if(PROFILING)
COMMAND make
COMMAND ctest
COMMAND lcov -d . -c -o output.info
COMMAND lcov -r output.info */tutorial* -o output.info
COMMAND lcov -r output.info /usr* -o output.info
COMMAND lcov -r output.info */test* -o output.info
COMMAND lcov -r output.info '*/tutorial*' -o output.info
COMMAND lcov -r output.info '/usr*' -o output.info
COMMAND lcov -r output.info '*/test*' -o output.info
COMMAND genhtml output.info -o coverage/ --highlight --legend
)
else(LCOV)

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