*** empty log message ***

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c85cab4e97b5ce7c4599ad24e4d7d26353a166d..88ab61b70476addf630ec7ea23a6124361b877b0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@
 # have a look at :
 # http://www.creatis.insa-lyon.fr/site/fr/CreatoosGettingStarted-v2.0.X
 # before starting.
----------------------------------
+#---------------------------------
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 #MARK_AS_ADVANCED( FORCE CMAKE_BACKWARDS_COMPATIBILITY )

diff --git a/bbtk/CMakeLists.txt b/bbtk/CMakeLists.txt
index a8408caa8141de8be416c6fa04b35b6312f26a15..1e5e155a497f341cd6cf45b8ce14fe0951592d23 100644 (file)
--- a/bbtk/CMakeLists.txt
+++ b/bbtk/CMakeLists.txt
@@ -126,13 +126,20 @@ SET(${BBTK_PACKAGE_NAME}_INCLUDE_DIRS
 #===========================================================================
 
 #===========================================================================
+
+IF (${BUILD_ParserOsirix})
+  SET ( PARSEROSIRIX_LIBRARIES "kernelParserOsirix")
+ELSE(${BUILD_ParserOsirix})
+  SET ( PARSEROSIRIX_LIBRARIES "")
+ENDIF (${BUILD_ParserOsirix})
+
 SET(${BBTK_PACKAGE_NAME}_LIBS 
   # LIST HERE THE ADDITIONAL LIBS TO LINK AGAINST
   # EXCEPT : the same libs than for INCLUDE_DIRS 
        Interface_ManagerContour_NDimensions_lib
        Interface_Icons_NDimensions_lib
        kernel_ManagerContour_NDimensions_lib
-       kernelParserOsirix
+       ${PARSEROSIRIX_LIBRARIES} 
        ${creaEnvironment_LIBRARIES} 
        ${creaMaracasVisu_LIBRARIES}
        

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index a3fceae672c7f8c2cfa5d2bf19b4708ba4480bd9..40c6dc33c70a204c45039ee78136e6d48fbfe56d 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -32,6 +32,7 @@ SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
   ENDIF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
 
   IF(UNIX)
+    ADD_DEFINITIONS(-fPIC)
     SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
       ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
     SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
@@ -55,4 +56,4 @@ SUBDIRS(Interface_ManagerContour_NDimensions)
 SUBDIRS(Interface_Icons_NDimensions)
 SUBDIRS(kernel_ManagerContour_NDimensions)
  
-  
\ No newline at end of file
+  

diff --git a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx
index 73378859fa5fe190bd63106d106516324e22b239..796b2f320880173e1c6e828649a3e338a08d7106 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx
@@ -188,7 +188,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
                        }                                       
                }*/
 
-               int groupID = (int)event.GetClientData();
+               int groupID = *(int*)event.GetClientData();
                wxConceptControl * eventConcept = (wxConceptControl *)event.GetEventObject();
                if ( eventConcept->getIfChecked( groupID ) )
                {