Commit 711ce648 authored by saubatn's avatar saubatn
Browse files

NEW : action_extension and component_extension macros are now merged into one...

NEW :	action_extension and component_extension macros are now merged into one single macro : camitk_extension.
	usage : camitk_extension(ACTION_EXTENSION ...) or camitk_extension(COMPONENT_EXTENSION ...).
FIXED :	wizard has been updated correspondingly.

git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@212 ec899d31-69d1-42ba-9299-647d76f65fb3
parent 396f4184
action_extension(DEFAULT
camitk_extension(
ACTION_EXTENSION
DEFAULT
DEFINES COMPILE_APPLICATION_ACTION_API
)
\ No newline at end of file
action_extension(DEFAULT
camitk_extension(
ACTION_EXTENSION
DEFAULT
DEFINES COMPILE_LUT_ACTION_API)
\ No newline at end of file
action_extension(
camitk_extension(A
CTION_EXTENSION
NEEDS_ITK
LIBRARIES ITKBasicFilters ITKCommon ITKIO
)
action_extension(
camitk_extension(
ACTION_EXTENSION
NEEDS_ITK
NEEDS_ACTION_EXTENSION multipicking
LIBRARIES ITKBasicFilters ITKCommon ITKIO multipicking
......
action_extension(DEFAULT
camitk_extension(
ACTION_EXTENSION
DEFAULT
DEFINES COMPILE_MULTIPICKING_ACTION_API
INSTALL_ALL_HEADERS)
\ No newline at end of file
action_extension(DEFAULT
camitk_extension(
ACTION_EXTENSION
DEFAULT
DEFINES COMPILE_RECONSTRUCTION_ACTION_API)
\ No newline at end of file
action_extension(DEFAULT
camitk_extension(
ACTION_EXTENSION
DEFAULT
DEFINES COMPILE_VOLUME_RENDERING_ACTION_API)
action_extension(DEFAULT
camitk_extension(ACTION_EXTENSION
DEFAULT
DEFINES COMPILE_BASIC_MESH_ACTION_API)
\ No newline at end of file
action_extension(DEFAULT
camitk_extension(
ACTION_EXTENSION
DEFAULT
DEFINES COMPILE_BASIC_TOPOLOGY_ACTION_API)
\ No newline at end of file
# for building tetgen lib
add_subdirectory(tetgen1.4.3)
action_extension(DEFAULT
INCLUDE_DIRECTORIES tetgen1.4.3
LIBRARIES tetgen
NEEDS_COMPONENT_EXTENSION vtkmesh
DEFINES COMPILE_MESHPROCESSING_ACTION_API TETLIBRARY)
camitk_extension(
ACTION_EXTENSION
DEFAULT
INCLUDE_DIRECTORIES tetgen1.4.3
LIBRARIES tetgen
NEEDS_COMPONENT_EXTENSION vtkmesh
DEFINES COMPILE_MESHPROCESSING_ACTION_API TETLIBRARY)
......@@ -11,7 +11,8 @@ if(MML_SOFA_SUPPORT)
include_directories(${XERCESC_ROOT_DIR}/include)
endif()
action_extension(NEEDS_LIBXML2
camitk_extension(ACTION_EXTENSION
NEEDS_LIBXML2
INCLUDE_DIRECTORIES tetgen1.4.3
LIBRARIES tetgen
NEEDS_TOOL pml lml mml monitoringgui monitoring
......@@ -20,7 +21,8 @@ endif()
if(0)
# TODO remove sofa dependency
action_extension(NEEDS_LIBXML2
camitk_extension(ACTION_EXTENSION
NEEDS_LIBXML2
INCLUDE_DIRECTORIES tetgen1.4.3
LIBRARIES tetgen
NEEDS_COMPONENT_EXTENSION vtkmesh
......
/*****************************************************************************
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
* This file is part of CamiTK.
*
* CamiTK is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* CamiTK is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with CamiTK. If not, see <http://www.gnu.org/licenses/>.
*
* $CAMITK_LICENCE_END$
/*****************************************************************************
* $CAMITK_LICENCE_BEGIN$
*
* CamiTK - Computer Assisted Medical Intervention ToolKit
* (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
*
* Visit http://camitk.imag.fr for more information
*
* This file is part of CamiTK.
*
* CamiTK is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* CamiTK is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with CamiTK. If not, see <http://www.gnu.org/licenses/>.
*
* $CAMITK_LICENCE_END$
****************************************************************************/
#include "ExtensionGenerator.h"
#include "ActionGenerator.h"
......@@ -185,6 +185,7 @@ void ExtensionGenerator::generateCMakeLists() throw (QString) {
text = in.readLine();
text.replace(QRegExp("@EXTENSIONNAME@"), extensionClassName.toLower());
text.replace(QRegExp("@EXTTYPELOW@"), QString(theExtension->type()->c_str()));
text.replace(QRegExp("@EXTTYPEHIGH@"), QString(theExtension->type()->c_str()).toUpper());
if (text.contains(QRegExp("@NEEDEDLIBS@"))) {
foreach(QString lib, neededLibs.keys()) {
......
......@@ -4,7 +4,8 @@ include(FindCamiTK.cmake)
include(CreateLaunchers)
# Call CamiTK CMake Macro to define the @EXTTYPELOW@
@EXTTYPELOW@_extension(DEFAULT
camitk_extension(@EXTTYPEHIGH@_EXTENSION
DEFAULT
@NEEDEDLIBS@
@NEEDEDTOOLS@
@NEEDEDCOMPEXT@
......
This diff is collapsed.
# dicom component just needs to use the component_extension macro
component_extension(NEEDS_ITK
camitk_extension(
COMPONENT_EXTENSION
NEEDS_ITK
# LIBRARIES ITKBasicFilters ITKCommon ITKIO
)
# itkimage component just needs to use the component_extension macro
component_extension(NEEDS_ITK
camitk_extension(COMPONENT_EXTENSION NEEDS_ITK
)
......@@ -18,7 +18,8 @@ if(COMPONENT_MML)
endif()
component_extension(NEEDS_LIBXML2
camitk_extension( COMPONENT_EXTENSION
NEEDS_LIBXML2
NEEDS_TOOL pml lml mml monitoringgui monitoring
NEEDS_COMPONENT_EXTENSION vtkmesh physicalmodel
HEADERS_TO_INSTALL MMLComponentExtension.h
......
# nothing special for this component extension
component_extension(DEFAULT)
camitk_extension(
COMPONENT_EXTENSION
DEFAULT)
# nothing special for this component extension
component_extension(DEFAULT)
camitk_extension(
COMPONENT_EXTENSION
DEFAULT)
# build component extension
component_extension(NEEDS_LIBXML2
camitk_extension(
COMPONENT_EXTENSION
NEEDS_LIBXML2
NEEDS_TOOL pml lml
INCLUDE_DIRECTORIES loads ${CMAKE_CURRENT_BINARY_DIR}/loads
DEFINES COMPILE_PHYSICALMODEL_COMPONENT_API
......
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