Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit 6234b095 authored by saubatn's avatar saubatn
Browse files

FIXED Create a CMake variable SHIBOKEN_CAMITK_SDK_PATH that stores the CamiTK...

FIXED Create a CMake variable SHIBOKEN_CAMITK_SDK_PATH that stores the CamiTK SDK tree structure, needed for Shiboken to correctly find where to look for the C++ classes to wrap.
Note, we may include this variable generation in a CamiTK CMake macro (such as camitk_add_subdirectory) to make it more generic, as soon as the Python wrapping works.

git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@1174 ec899d31-69d1-42ba-9299-647d76f65fb3
parent f84bc4ec
......@@ -77,6 +77,9 @@ include(CamiTKApiDoc)
# initialize subproject management
camitk_sub_project_init()
# Create a shiboken path variable containing the CamiTK SDK tree structure, needed by shiboken to find C++ classes to wrap
set(SHIBOKEN_CAMITK_SDK_PATH ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
# add all subprojects
camitk_add_subdirectory(libraries)
camitk_add_subdirectory(applications)
......
......@@ -9,6 +9,9 @@
# find components
get_subdirectories(ACTIONS_LIST)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
# Add subdirectories in CMake project
foreach(ACTION_NAME ${ACTIONS_LIST})
add_subdirectory(${ACTION_NAME})
......
......@@ -7,4 +7,7 @@ camitk_extension( ACTION_EXTENSION
if(NOT ACTION_APPLICATION)
message(FATAL_ERROR "ACTION_APPLICATION cannot be set to OFF, it is mandatory for any CamiTK applications")
endif()
\ No newline at end of file
endif()
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
\ No newline at end of file
......@@ -9,6 +9,9 @@
# find components
get_subdirectories(IMAGE_ACTIONS_LIST)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
# Add subdirectories in CMake project
foreach(ACTION_NAME ${IMAGE_ACTIONS_LIST})
add_subdirectory(${ACTION_NAME})
......
......@@ -3,4 +3,7 @@ camitk_extension( ACTION_EXTENSION
CEP_NAME SDK
DESCRIPTION "Control of the arbitrary slice on image component"
TEST_APPLICATION ${APPLICATION_TEST_ACTION}
)
\ No newline at end of file
)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
\ No newline at end of file
......@@ -5,4 +5,7 @@ camitk_extension( ACTION_EXTENSION
CEP_NAME SDK
DESCRIPTION "Helps you to crop a volume to keep only an interesting subsample"
TEST_APPLICATION ${APPLICATION_TEST_ACTION}
)
\ No newline at end of file
)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
\ No newline at end of file
......@@ -3,4 +3,7 @@ camitk_extension( ACTION_EXTENSION
CEP_NAME SDK
DESCRIPTION "Displays the image look-up-table (lut)"
TEST_APPLICATION ${APPLICATION_TEST_ACTION}
)
\ No newline at end of file
)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
\ No newline at end of file
......@@ -4,4 +4,7 @@ camitk_extension( ACTION_EXTENSION
CEP_NAME SDK
DESCRIPTION "Action-multipicking allows to make several pixel picking on an image component (volumic image)"
TEST_APPLICATION ${APPLICATION_TEST_ACTION}
)
\ No newline at end of file
)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
\ No newline at end of file
......@@ -3,4 +3,7 @@ camitk_extension( ACTION_EXTENSION
CEP_NAME SDK
DESCRIPTION "Use marching cube algorithm to create a surfacic mesh from a volumic image"
TEST_APPLICATION ${APPLICATION_TEST_ACTION}
)
\ No newline at end of file
)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
\ No newline at end of file
......@@ -3,4 +3,6 @@ camitk_extension( ACTION_EXTENSION
DESCRIPTION "Display in 3D the component"
TEST_APPLICATION ${APPLICATION_TEST_ACTION}
)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
\ No newline at end of file
......@@ -4,4 +4,7 @@ camitk_extension( ACTION_EXTENSION
CEP_NAME SDK
DESCRIPTION "Use ray tracing to produce a 3D reprensation of the image"
TEST_APPLICATION ${APPLICATION_TEST_ACTION}
)
\ No newline at end of file
)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
\ No newline at end of file
......@@ -3,4 +3,7 @@ camitk_extension( ACTION_EXTENSION
CEP_NAME SDK
DESCRIPTION "Provides basic actions on meshes"
TEST_APPLICATION ${APPLICATION_TEST_ACTION}
)
\ No newline at end of file
)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
\ No newline at end of file
......@@ -3,4 +3,7 @@ camitk_extension( ACTION_EXTENSION
CEP_NAME SDK
DESCRIPTION "Helps building simple 3D objects"
TEST_APPLICATION ${APPLICATION_TEST_ACTION}
)
\ No newline at end of file
)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
\ No newline at end of file
......@@ -5,3 +5,6 @@ camitk_extension( ACTION_EXTENSION
DESCRIPTION "Features some nice algorithms for mesh processing"
TEST_APPLICATION ${APPLICATION_TEST_ACTION}
)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
\ No newline at end of file
......@@ -9,6 +9,9 @@
# Find applications
get_subdirectories(APPLICATIONS_LIST)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
# --- add every given application
foreach(APPLICATION_NAME ${APPLICATIONS_LIST})
add_subdirectory(${APPLICATION_NAME})
......
......@@ -5,4 +5,7 @@ camitk_application(NEEDS_QT_MODULES #we use QtXML
DESCRIPTION "Simple action state machine to pipeline actions from an XML file"
)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
......@@ -10,3 +10,5 @@ else()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CamiTKVersionInformation.h.in ${CMAKE_CURRENT_BINARY_DIR}/CamiTKVersionInformation.h @ONLY)
endif()
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
\ No newline at end of file
......@@ -2,3 +2,6 @@ camitk_application( ADDITIONAL_SOURCES CommandLineOptions.cxx CommandLineOptions
CEP_NAME SDK
DESCRIPTION "All-in-one application to load actions and component and interact with them"
)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
\ No newline at end of file
......@@ -29,4 +29,7 @@ if(APPLICATION_WIZARD)
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
VERBATIM
)
endif()
\ No newline at end of file
endif()
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
\ No newline at end of file
......@@ -9,6 +9,9 @@
# find components
get_subdirectories(COMPONENTS_LIST)
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
# Add subdirectories in CMake project
foreach(COMPONENT_NAME ${COMPONENTS_LIST})
add_subdirectory(${COMPONENT_NAME})
......
Markdown is supported
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