Commit f4d7d373 authored by saubatn's avatar saubatn
Browse files

UPDATED CamiTK / CEP Packaging step 2.

UPDATED Prefix all libraries target with 'library-'.
UPDATED Preparation for step 3 : regex replace '-' by '_' for packaging (sdk + cep).


git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@837 ec899d31-69d1-42ba-9299-647d76f65fb3
parent 21e6e8dd
......@@ -3,4 +3,6 @@ camitk_extension(ACTION_EXTENSION
NEEDS_XSD
NEEDS_CEP_LIBRARIES pml mml monitoring lml
NEEDS_COMPONENT_EXTENSION physicalmodel mml vtkmesh physicalmodel
CEP_NAME CEP_MODELING
DESCRIPTION "Action MML features algorithms applicable on MML components."
)
\ No newline at end of file
......@@ -12,12 +12,13 @@ if(COMPONENT_MML)
endif()
endif()
camitk_extension(COMPONENT_EXTENSION
NEEDS_LIBXML2
NEEDS_XSD
NEEDS_CEP_LIBRARIES pml lml mml monitoringgui monitoring
NEEDS_COMPONENT_EXTENSION vtkmesh physicalmodel
HEADERS_TO_INSTALL MMLComponentExtension.h
camitk_extension( COMPONENT_EXTENSION
NEEDS_LIBXML2
NEEDS_XSD
NEEDS_CEP_LIBRARIES pml lml mml monitoringgui monitoring
NEEDS_COMPONENT_EXTENSION vtkmesh physicalmodel
INCLUDE_DIRECTORIES ${CAMITK_INCLUDE_DIR}/libraries/monitoring
HEADERS_TO_INSTALL MMLComponentExtension.h
MMLComponent.h
MMLDisplay.h
MMLMonitorDisplay.h
......@@ -26,4 +27,6 @@ camitk_extension(COMPONENT_EXTENSION
MMLMonitorDisplays/Arrows.h
MMLMonitorDisplays/Tabular.h
MMLComponentPopup.h
CEP_NAME CEP_MODELING
DESCRIPTION "Component MML allows to handle XML file that compare biomechanical simulations with different simulators"
)
......@@ -3,7 +3,7 @@ camitk_extension(
COMPONENT_EXTENSION
NEEDS_LIBXML2
NEEDS_CEP_LIBRARIES pml lml
INCLUDE_DIRECTORIES loads ${CMAKE_CURRENT_BINARY_DIR}/loads
INCLUDE_DIRECTORIES loads ${CMAKE_CURRENT_BINARY_DIR}/loads ${CAMITK_INCLUDE_DIR}/libraries
DEFINES COMPILE_PHYSICALMODEL_COMPONENT_API
HEADERS_TO_INSTALL PMComponentAPI.h
AtomDC.h
......@@ -16,6 +16,8 @@ camitk_extension(
loads/Decoration.h
loads/AtomDecoration.h
loads/AnyDecoration.h
CEP_NAME CEP_MODELING
DESCRIPTION "Provide the basic components to handle biomechanical models"
)
......
......@@ -63,13 +63,23 @@ add_subdirectory(test)
#--------------
# installation
#--------------
export_headers(${HEADERS} COMPONENT lml)
if (PACKAGING_NSIS)
export_headers( ${HEADERS}
COMPONENT library_lml
GROUP libraries
)
else()
export_headers( ${HEADERS}
COMPONENT library-lml
GROUP libraries
)
endif()
# lib installation
install(TARGETS lml
ARCHIVE DESTINATION lib/${CAMITK_SHORT_VERSION_STRING}
COMPONENT lml
)
# # lib installation
# install(TARGETS lml
# ARCHIVE DESTINATION lib/${CAMITK_SHORT_VERSION_STRING}
# COMPONENT lml
# )
#-------------------
# api documentation
......
set (SRCS lmltest.cpp)
add_executable(lmltest ${SRCS})
set(LML_LIBRARIES lml ${LIBXML2_LIBRARIES})
if (PACKAGING_NSIS)
set(LML_LIBRARIES library_lml ${LIBXML2_LIBRARIES})
else()
set(LML_LIBRARIES library-lml ${LIBXML2_LIBRARIES})
endif()
target_link_libraries(lmltest ${LML_LIBRARIES})
add_dependencies(lmltest lml)
if (PACKAGING_NSIS)
add_dependencies(lmltest library_lml)
else()
add_dependencies(lmltest library-lml)
endif()
#----------
# Testing
......
......@@ -7,10 +7,11 @@ endif()
set(MML_INCLUDE_DIRECTORIES
${CAMITK_INCLUDE_DIRECTORIES}
${CAMITK_INCLUDE_DIR}/monitoring
${CAMITK_INCLUDE_DIR}/mml
${CAMITK_INCLUDE_DIR}/pml
${CAMITK_INCLUDE_DIR}/lml
${CAMITK_INCLUDE_DIR}/libraries
${CAMITK_INCLUDE_DIR}/libraries/monitoring
${CAMITK_INCLUDE_DIR}/libraries/mml
${CAMITK_INCLUDE_DIR}/libraries/pml
${CAMITK_INCLUDE_DIR}/libraries/lml
${LIBXML2_INCLUDE_DIR}
${XERCESC_INCLUDE_DIR}
${XSD_INCLUDE_DIR}
......
project(gui)
if (PACKAGING_NSIS)
set(LIB_NAME library_monitoringgui)
set(LIB_NAME_MONITORING library_monitoring)
else()
set(LIB_NAME library-monitoringgui)
set(LIB_NAME_MONITORING library-monitoring)
endif()
find_package(Qt4 REQUIRED)
include(${QT_USE_FILE})
......@@ -53,16 +61,16 @@ add_definitions(-DCOMPILE_MML_MONIGORING_GUI_TOOL)
camitk_library(STATIC
LIBNAME monitoringgui
SOURCES ${gui_SRCS}
INCLUDE_DIRECTORIES ${MML_INCLUDE_DIRECTORIES} ${CAMITK_INCLUDE_DIR}/monitoring ${QT_INCLUDE_DIR}
INCLUDE_DIRECTORIES ${MML_INCLUDE_DIRECTORIES} ${CAMITK_INCLUDE_DIR}/libraries/monitoring ${QT_INCLUDE_DIR}
)
add_dependencies(monitoringgui monitoring)
add_dependencies(${LIB_NAME} ${LIB_NAME_MONITORING})
set(gui_LIBRARIES
${QT_LIBRARIES}
${MML_LIBRARIES}
monitoring
monitoringgui
${LIB_NAME_MONITORING}
${LIB_NAME}
)
add_executable(benchmarkgui ${gui_SRCS})
......@@ -74,11 +82,12 @@ target_link_libraries(benchmarkgui ${gui_LIBRARIES})
#--------------
export_headers(
${gui_HEADERS}
COMPONENT monitoringgui
COMPONENT ${LIB_NAME}
GROUP libraries
)
# lib installation
install(TARGETS monitoringgui
ARCHIVE DESTINATION lib/${CAMITK_SHORT_VERSION_STRING}
COMPONENT monitoringgui
)
\ No newline at end of file
# install(TARGETS monitoringgui
# ARCHIVE DESTINATION lib/${CAMITK_SHORT_VERSION_STRING}
# COMPONENT monitoringgui
# )
\ No newline at end of file
project(monitoring)
if (PACKAGING_NSIS)
set(LIB_NAME library_monitoring)
else()
set(LIB_NAME library-monitoring)
endif()
# TODO properly define the path to the XML Schema at run time (in MonitoringManager and MonitoringManagerFactory)
# otherwise this generates an error when executing the application on a machine that have no or a different
# source dir path!
......@@ -322,11 +328,19 @@ set(monitoring_SRCS
manager/NonInteractiveMonitoringManager.cpp
)
set(monitoring_LIBRARIES
mml
pml
lml
)
if (PACKAGING_NSIS)
set( monitoring_LIBRARIES
library_mml
library_pml
library_lml
)
else()
set( monitoring_LIBRARIES
library-mml
library-pml
library-lml
)
endif()
set(monitoring_link)
......@@ -358,7 +372,7 @@ endif(MML_GENERATE_GUI)
add_definitions(-DCOMPILE_MML_TOOL)
# add lib as a camitk tools
# add lib as a camitk library
camitk_library(SHARED
SOURCES ${monitoring_SRCS}
TARGET_LINK_LIBRARIES ${monitoring_LIBRARIES}
......@@ -367,7 +381,11 @@ camitk_library(SHARED
NEEDS_LIBXML2
)
add_dependencies(monitoring lml pml mml)
if (PACKAGING_NSIS)
add_dependencies(library_monitoring library_lml library_pml library_mml)
else()
add_dependencies(library-monitoring library-lml library-pml library-mml)
endif()
#--------------
# installation
......@@ -378,7 +396,8 @@ export_headers(
manager/InteractiveMonitoringManager.h
manager/NonInteractiveMonitoringManager.h
SUBDIRECTORY manager
COMPONENT monitoring
COMPONENT ${LIB_NAME}
GROUP libraries
)
export_headers(
......@@ -389,20 +408,23 @@ export_headers(
tools/SurfaceExtractor/Facet.h
tools/SurfaceExtractor/SurfaceExtractor.h
SUBDIRECTORY tools
COMPONENT monitoring
COMPONENT ${LIB_NAME}
GROUP libraries
)
export_headers(
reference/Reference.h
SUBDIRECTORY reference
COMPONENT monitoring
COMPONENT ${LIB_NAME}
GROUP libraries
)
export_headers(
monitor/Monitor.h
monitor/MonitorFactory.h
SUBDIRECTORY monitor
COMPONENT monitoring
COMPONENT ${LIB_NAME}
GROUP libraries
)
export_headers(
......@@ -423,7 +445,8 @@ export_headers(
monitor/monitors/MonitorComputingTime.h
SUBDIRECTORY monitor/monitors
COMPONENT monitoring
COMPONENT ${LIB_NAME}
GROUP libraries
)
if(MML_ANSYS_SUPPORT)
......@@ -432,7 +455,8 @@ export_headers(
simulator/simulators/Ansys/AnsysBatchWriter.h
simulator/simulators/Ansys/AnsysSimulator.h
SUBDIRECTORY simulator/simulators/Ansys
COMPONENT monitoring
COMPONENT ${LIB_NAME}
GROUP libraries
)
export_headers(
......@@ -441,7 +465,8 @@ export_headers(
simulator/simulators/Ansys/AnsysBatchWriters/PostWriter.h
simulator/simulators/Ansys/AnsysBatchWriters/ParametersWriter.h
SUBDIRECTORY simulator/simulators/Ansys/AnsysBatchWriters
COMPONENT monitoring
COMPONENT ${LIB_NAME}
GROUP libraries
)
endif()
......@@ -449,7 +474,8 @@ if(MML_ARTISYNTH_SUPPORT)
export_headers(
simulator/simulators/ArtiSynth/ArtiSynthSimulator.h
SUBDIRECTORY simulator/simulators/ArtiSynth
COMPONENT monitoring
COMPONENT ${LIB_NAME}
GROUP libraries
)
endif()
......@@ -457,7 +483,8 @@ if(MML_SOFA_SUPPORT)
export_headers(
${MML_SOFA_HEADERS}
SUBDIRECTORY simulator/simulators/Sofa
COMPONENT monitoring
COMPONENT ${LIB_NAME}
GROUP libraries
)
endif()
......@@ -465,13 +492,15 @@ if(MML_GENERATE_GUI)
export_headers(
simulator/SimulatorWidget.h
SUBDIRECTORY simulator
COMPONENT monitoring
COMPONENT ${LIB_NAME}
GROUP libraries
)
export_headers(
tools/Xmlhighlighter.h
SUBDIRECTORY tools
COMPONENT monitoring
COMPONENT ${LIB_NAME}
GROUP libraries
)
endif(MML_GENERATE_GUI)
......@@ -481,20 +510,23 @@ export_headers(
simulator/InteractiveSimulator.h
simulator/SimulatorFactory.h
SUBDIRECTORY simulator
COMPONENT monitoring
COMPONENT ${LIB_NAME}
GROUP libraries
)
export_headers(
simulator/simulators/InitSimulators.h
SUBDIRECTORY simulator/simulators
COMPONENT monitoring
COMPONENT ${LIB_NAME}
GROUP libraries
)
export_headers(
stoppingCriterion/StoppingCriterion.h
stoppingCriterion/StoppingCriterionFactory.h
SUBDIRECTORY stoppingCriterion
COMPONENT monitoring
COMPONENT ${LIB_NAME}
GROUP libraries
)
export_headers(
......@@ -505,7 +537,8 @@ export_headers(
stoppingCriterion/stoppingCriteria/Method.h
stoppingCriterion/stoppingCriteria/MethodFactory.h
SUBDIRECTORY stoppingCriterion/stoppingCriteria
COMPONENT monitoring
COMPONENT ${LIB_NAME}
GROUP libraries
)
export_headers(
......@@ -515,32 +548,36 @@ export_headers(
stoppingCriterion/stoppingCriteria/criteria/Time.h
stoppingCriterion/stoppingCriteria/criteria/Velocity.h
SUBDIRECTORY stoppingCriterion/stoppingCriteria/criteria
COMPONENT monitoring
COMPONENT ${LIB_NAME}
GROUP libraries
)
export_headers(
stoppingCriterion/stoppingCriteria/multipleCriteria/AndMultipleCriterion.h
stoppingCriterion/stoppingCriteria/multipleCriteria/OrMultipleCriterion.h
SUBDIRECTORY stoppingCriterion/stoppingCriteria/multipleCriteria
COMPONENT monitoring
COMPONENT ${LIB_NAME}
GROUP libraries
)
export_headers(
stoppingCriterion/stoppingCriteria/methods/MinThreshold.h
stoppingCriterion/stoppingCriteria/methods/Threshold.h
SUBDIRECTORY stoppingCriterion/methods
COMPONENT monitoring
COMPONENT ${LIB_NAME}
GROUP libraries
)
export_headers(
MMLAPI.h
COMPONENT monitoring
COMPONENT ${LIB_NAME}
GROUP libraries
)
# lib installation
install(TARGETS monitoring
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/${CAMITK_SHORT_VERSION_STRING}
COMPONENT monitoring
)
# install(TARGETS monitoring
# RUNTIME DESTINATION bin
# LIBRARY DESTINATION lib
# ARCHIVE DESTINATION lib/${CAMITK_SHORT_VERSION_STRING}
# COMPONENT monitoring
# )
project(mml)
if(PACKAGING_NSIS)
set(LIB_NAME library_mml)
else()
set(LIB_NAME library-mml)
endif()
# XSD really needed
find_package(XSD REQUIRED)
......@@ -44,10 +50,14 @@ camitk_library(STATIC
#--------------
# installation
#--------------
export_headers(${monitoringLib_H} COMPONENT mml)
message(STATUS " ::::::::::::::::::: exporting headers ${monitoringLib_H} ")
export_headers( ${monitoringLib_H}
COMPONENT ${LIB_NAME}
GROUP libraries
)
# lib installation
install(TARGETS mml
ARCHIVE DESTINATION lib/${CAMITK_SHORT_VERSION_STRING}
COMPONENT mml
)
# install(TARGETS mml
# ARCHIVE DESTINATION lib/${CAMITK_SHORT_VERSION_STRING}
# COMPONENT mml
# )
......@@ -15,46 +15,47 @@ configure_file(${PML_SOURCE_DIR}/PhysicalModelVersion.h.in ${PML_BINARY_DIR}/Phy
# Sets the variables for required include subdirectories :
set (PhysicalModelProperties_DIR ${PML_SOURCE_DIR}/PhysicalProperties)
set ( HEADERS
Atom.h
BasicAtomProperties.h
Cell.h
BasicCellProperties.h
Component.h
MultiComponent.h
PhysicalModel.h
${PML_BINARY_DIR}/PhysicalModelVersion.h
PhysicalModelIO.h
Properties.h
StructuralComponent.h
BasicSCProperties.h
Structure.h
StructureProperties.h
PMLAbortException.h
PMLTransform.h
RenderingMode.h
${PhysicalModelProperties_DIR}/AtomProperties.h
${PhysicalModelProperties_DIR}/CellProperties.h
${PhysicalModelProperties_DIR}/StructuralComponentProperties.h
set( HEADERS
Atom.h
BasicAtomProperties.h
Cell.h
BasicCellProperties.h
Component.h
MultiComponent.h
PhysicalModel.h
${PML_BINARY_DIR}/PhysicalModelVersion.h
PhysicalModelIO.h
Properties.h
StructuralComponent.h
BasicSCProperties.h
Structure.h
StructureProperties.h
PMLAbortException.h
PMLTransform.h
RenderingMode.h
${PhysicalModelProperties_DIR}/AtomProperties.h
${PhysicalModelProperties_DIR}/CellProperties.h
${PhysicalModelProperties_DIR}/StructuralComponentProperties.h
)
set (SRCS Atom.cpp
set(SRCS
Atom.cpp
BasicAtomProperties.cpp
Cell.cpp
Component.cpp
BasicCellProperties.cpp
MultiComponent.cpp
PhysicalModel.cpp
StructuralComponent.cpp
BasicSCProperties.cpp
Structure.cpp
StructureProperties.cpp
PMLTransform.cpp
${PhysicalModelProperties_DIR}/AtomProperties.cpp
${PhysicalModelProperties_DIR}/CellProperties.cpp
${PhysicalModelProperties_DIR}/StructuralComponentProperties.cpp
Properties.cpp
${HEADERS}
Cell.cpp
Component.cpp
BasicCellProperties.cpp
MultiComponent.cpp
PhysicalModel.cpp
StructuralComponent.cpp
BasicSCProperties.cpp
Structure.cpp
StructureProperties.cpp
PMLTransform.cpp
${PhysicalModelProperties_DIR}/AtomProperties.cpp
${PhysicalModelProperties_DIR}/CellProperties.cpp
${PhysicalModelProperties_DIR}/StructuralComponentProperties.cpp
Properties.cpp
${HEADERS}
)
......@@ -77,13 +78,24 @@ add_subdirectory(tools)
#--------------
# installation
#--------------
export_headers(${HEADERS} COMPONENT pml)
if (PACKAGING_NSIS)
export_headers( ${HEADERS}
COMPONENT library_pml
GROUP libraries
)
else()
export_headers( ${HEADERS}
COMPONENT library-pml
GROUP libraries
)
endif()
# lib installation
install(TARGETS pml
ARCHIVE DESTINATION lib/${CAMITK_SHORT_VERSION_STRING}
COMPONENT pml
)
# install(TARGETS pml
# ARCHIVE DESTINATION lib/${CAMITK_SHORT_VERSION_STRING}
# COMPONENT pml
# )
#-------------------
# api documentation
......
set (SRCS pmltest.cpp)
add_executable(pmltest ${SRCS})
set(PML_LIBRARIES pml ${LIBXML2_LIBRARIES})
if (PACKAGING_NSIS)
set(PML_LIBRARIES library_pml ${LIBXML2_LIBRARIES})
else()
set(PML_LIBRARIES library-pml ${LIBXML2_LIBRARIES})
endif()
target_link_libraries(pmltest ${PML_LIBRARIES})
add_dependencies(pmltest pml)
if (PACKAGING_NSIS)
add_dependencies(pmltest library_pml)
else()
add_dependencies(pmltest library-pml)
endif()
#----------
# Testing
......
......@@ -43,15 +43,17 @@ file(GLOB HEADERS_UPPERCASE "src/Qt*")
# installation
#--------------
export_headers(${CUSTOM_PLOT_HEADERS}
COMPONENT qcustomplot)
COMPONENT qcustomplot
GROUP libraries
)
# lib installation
install(TARGETS qcustomplot
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/${CAMITK_SHORT_VERSION_STRING}
COMPONENT qcustomplot
)
# install(TARGETS qcustomplot
# RUNTIME DESTINATION bin
# LIBRARY DESTINATION lib
# ARCHIVE DESTINATION lib/${CAMITK_SHORT_VERSION_STRING}
# COMPONENT qcustomplot
# )
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment