From e6d3c7fac51c377ad9550abe714065b470ad7eb6 Mon Sep 17 00:00:00 2001
From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Fri, 5 Mar 2010 22:01:50 +0000
Subject: [PATCH] *** empty log message ***

---
 CMakeLists.txt                                           | 2 +-
 bbtk/CMakeLists.txt                                      | 9 ++++++++-
 lib/CMakeLists.txt                                       | 3 ++-
 .../wxInstantChooserPanel.cxx                            | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c85cab..88ab61b 100644
--- 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 a8408ca..1e5e155 100644
--- 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 a3fceae..40c6dc3 100644
--- 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 7337885..796b2f3 100644
--- 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 ) )
 		{
-- 
2.45.0