X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FCMakeLists.txt;h=f01315324b47f07de6a030be075fd632d07b7d60;hb=8cbad3dc345346d0473d93cdc06dc9eb5cbdbf23;hp=dcd505acba10353a43237f9cccba8dcc23788b4c;hpb=a09174b82cb36ffd30bdbaed12c6ebd936a0e8f7;p=bbtk.git

diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt
index dcd505a..f013153 100644
--- a/kernel/src/CMakeLists.txt
+++ b/kernel/src/CMakeLists.txt
@@ -76,8 +76,6 @@ CHECK_INCLUDE_FILE("sys/timeb.h"    CMAKE_HAVE_SYS_TIMEB_H)
 
 #-----------------------------------------------------------------------------
 # WXWIDGETS
-OPTION(BBTK_USE_WXWIDGETS "Build bbtk library and applications in graphical mode using the wxWidgets library" OFF)
-
 IF(BBTK_USE_WXWIDGETS)
   SET(USE_WXWIDGETS ON CACHE BOOL "Use WxWidgets" FORCE)
 
@@ -91,6 +89,21 @@ IF(BBTK_USE_WXWIDGETS)
 ENDIF(BBTK_USE_WXWIDGETS)
 #-----------------------------------------------------------------------------
 
+#-----------------------------------------------------------------------------
+# KWWIDGETS
+IF(BBTK_USE_KWWIDGETS)
+  SET(USE_KWWIDGETS ON CACHE BOOL "Use KWWidgets" FORCE)
+
+#  INCLUDE(cmake/FIND_AND_USE_WXWIDGETS.cmake)
+#  FIND_AND_USE_WXWIDGETS()
+#  ADD_DEF( _USE_WXWIDGETS_ )
+  SET(BBTK_LINK_LIBRARIES
+    ${BBTK_LINK_LIBRARIES}
+    ${BBTK_KWWIDGETS_LIBRARIES} 
+    )
+ENDIF(BBTK_USE_KWWIDGETS)
+#-----------------------------------------------------------------------------
+
 #-----------------------------------------------------------------------------
 # BOOST 
 SET(BBTK_USE_BOOST TRUE)
@@ -171,13 +184,22 @@ ADD_DEF(BBTK_EXPORT_SYMBOLS)
 FILE(GLOB SOURCES "." "*.cxx" "*.cpp") 
 # "ThirdParty/wx/treemultictrl/*.cpp")
 FILE(GLOB SOURCES_H "." "*.h" )
+
+IF(BBTK_USE_KWWIDGETS)
+include("${KWWidgets_CMAKE_DIR}/KWWidgetsWrappingMacros.cmake")
+kwwidgets_wrap_tcl(bbtk LIB_TCL_SRCS "vtkKWBlackBoxDialog.cxx" "")
+SET(SOURCES ${SOURCES} ${LIB_TCL_SRCS})
+ENDIF(BBTK_USE_KWWIDGETS)
+
 #-----------------------------------------------------------------------------
 # lib definition
 ADD_LIBRARY(bbtk SHARED ${SOURCES} ${SOURCES_H})
 #-----------------------------------------------------------------------------
 TARGET_LINK_LIBRARIES(bbtk ${BBTK_LINK_LIBRARIES})
 #-----------------------------------------------------------------------------
+IF(UNIX)
 SET_TARGET_PROPERTIES(bbtk PROPERTIES COMPILE_FLAGS -Wall)
+ENDIF(UNIX)
 
 #IF(UNIX)
 # for gnu linker : version script used to define exported symbols
@@ -188,6 +210,7 @@ SET_TARGET_PROPERTIES(bbtk PROPERTIES COMPILE_FLAGS -Wall)
 #ENDIF(UNIX)
 #-----------------------------------------------------------------------------
 
+
 #-----------------------------------------------------------------------------
 # EO bbtk library creation
 #-----------------------------------------------------------------------------
@@ -206,10 +229,7 @@ SET_TARGET_PROPERTIES(bbtk PROPERTIES COMPILE_FLAGS -Wall)
 #-----------------------------------------------------------------------------
 FILE(GLOB BBTK_HEADERS "*.h")
 INSTALL(FILES ${BBTK_HEADERS} DESTINATION include/bbtk)
-INSTALL(TARGETS bbtk DESTINATION lib)
-IF(WIN32)
-  INSTALL(TARGETS bbtk DESTINATION bin/)
-ENDIF(WIN32)
+INSTALL(TARGETS bbtk DESTINATION ${BBTK_LIB_PATH})
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -239,7 +259,7 @@ ELSE(UNIX)
     ${EXECUTABLE_OUTPUT_REL_PATH}/Release)
 ENDIF(UNIX)
 SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/bbtk include/bbtk/ThirdParty)
-SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
+SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS ${BBTK_LIB_PATH})
 
 # OPTIONAL 
 # - Set the version of your library