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

Fix the bus in install location which is now determine by the OS

Browse source
This commit is contained in:
quemy 2012-11-03 18:44:19 +01:00
commit f83191bedd
33 changed files with 56 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

6
eo/src/CMakeLists.txt
View file

@ -21,13 +21,13 @@ SET(EO_SOURCES
)
ADD_LIBRARY(eo STATIC ${EO_SOURCES})
INSTALL(TARGETS eo ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
INSTALL(TARGETS eo ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
FILE(GLOB HDRS *.h eo)
INSTALL(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/eo COMPONENT headers)
INSTALL(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/eo COMPONENT headers)
INSTALL(DIRECTORY do es ga gp other utils
DESTINATION local/include${INSTALL_SUB_DIR}/eo
DESTINATION include${INSTALL_SUB_DIR}/eo
COMPONENT headers
FILES_MATCHING PATTERN "*.h" PATTERN "checkpointing" PATTERN external_eo
)

4
eo/src/es/CMakeLists.txt
View file

@ -38,10 +38,10 @@ SET(CMA_SOURCES
)
ADD_LIBRARY(es STATIC ${ES_SOURCES})
INSTALL(TARGETS es ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
INSTALL(TARGETS es ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
ADD_LIBRARY(cma STATIC ${CMA_SOURCES})
INSTALL(TARGETS cma ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
INSTALL(TARGETS cma ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
######################################################################################
### 3) Optionnal

2
eo/src/ga/CMakeLists.txt
View file

@ -23,7 +23,7 @@ SET(GA_SOURCES
)
ADD_LIBRARY(ga STATIC ${GA_SOURCES})
INSTALL(TARGETS ga ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
INSTALL(TARGETS ga ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
######################################################################################
### 3) Optionnal

2
eo/src/pyeo/CMakeLists.txt
View file

@ -48,7 +48,7 @@ SET(EO_SOURCES
# shared library
ADD_LIBRARY(PyEO MODULE ${SOURCES} ${EO_SOURCES})
INSTALL(TARGETS PyEO LIBRARY DESTINATION local/${LIB} COMPONENT libraries)
INSTALL(TARGETS PyEO LIBRARY DESTINATION ${LIB} COMPONENT libraries)
# python 2.5 must have pyd
IF(WIN32 AND NOT CYGWIN)

2
eo/src/utils/CMakeLists.txt
View file

@ -33,7 +33,7 @@ SET(EOUTILS_SOURCES
)
ADD_LIBRARY(eoutils STATIC ${EOUTILS_SOURCES})
INSTALL(TARGETS eoutils ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
INSTALL(TARGETS eoutils ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
######################################################################################