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

add cmake export to all targets & bugfix Find module

Browse source 
- Add "EXPORT paradiseo-targets" to cmake's "install" commands.
- Export those targets in "paradiseo-config.cmake",
  which is needed by FindParadiseo.cmake script.
- Bugfix "FindParadiseo.cmake" script:
    - document PARADISEO_ROOT input,
    - add PARADISEO_DIR to specify a bin dir (try build, debug and release as defaults),
    - bugfix bad copy pastes involving edo and peo,
    - default messages only for eo, mo and meo.
This commit is contained in:
Johann Dreo 2019-09-29 21:14:30 +02:00
commit d83681d6fa
12 changed files with 61 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
eo/src/CMakeLists.txt
View file

@ -29,7 +29,7 @@ add_library(eo STATIC ${EO_SOURCES})
set(EO_VERSION ${GLOBAL_VERSION})
set_target_properties(eo PROPERTIES VERSION "${EO_VERSION}")
install(TARGETS eo ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
install(TARGETS eo EXPORT paradiseo-targets ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
file(GLOB HDRS *.h eo)
install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/eo COMPONENT headers)

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 ${LIB} COMPONENT libraries)
install(TARGETS es EXPORT paradiseo-targets ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
add_library(cma STATIC ${CMA_SOURCES})
install(TARGETS cma ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
install(TARGETS cma EXPORT paradiseo-targets 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 ${LIB} COMPONENT libraries)
install(TARGETS ga EXPORT paradiseo-targets ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
######################################################################################
### 3) Optionnal

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

@ -20,7 +20,7 @@ set(EOMPI_SOURCES
)
add_library(eompi STATIC ${EOMPI_SOURCES})
install(TARGETS eompi ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
install(TARGETS eompi EXPORT paradiseo-targets ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
file(GLOB HDRS *.h)
install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/eo/mpi COMPONENT headers)

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 ${LIB} COMPONENT libraries)
install(TARGETS PyEO EXPORT paradiseo-targets LIBRARY DESTINATION ${LIB} COMPONENT libraries)
# python 2.5 must have pyd
if(WIN32 AND NOT CYGWIN)

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

@ -20,7 +20,7 @@ set(EOSERIAL_SOURCES
)
add_library(eoserial STATIC ${EOSERIAL_SOURCES})
install(TARGETS eoserial ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
install(TARGETS eoserial EXPORT paradiseo-targets ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
file(GLOB HDRS *.h)
install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/eo/serial COMPONENT headers)

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 ${LIB} COMPONENT libraries)
install(TARGETS eoutils EXPORT paradiseo-targets ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
######################################################################################