From: guigues Date: Mon, 12 Jan 2009 09:07:08 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: v0.9.1~15 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=2635eb8955b1cc9c47e69794d07523790303021e;p=bbtk.git *** empty log message *** --- diff --git a/kernel/cmake/BBTKDefineOptions.cmake b/kernel/cmake/BBTKDefineOptions.cmake index ac242bf..d9d86a4 100644 --- a/kernel/cmake/BBTKDefineOptions.cmake +++ b/kernel/cmake/BBTKDefineOptions.cmake @@ -13,7 +13,7 @@ OPTION(BUILD_BBTK_DOC "Build documentation for bbtk." OFF) SWITCH_ON_IF_BUILD_ALL(BUILD_BBTK_DOC) #----------------------------------------------------------------------------- IF(BUILD_BBTK_DOC) - + OPTION(BUILD_BBTK_DOC_PACKAGE "Build bbtk packages documentation (bbi+dot)." ON) OPTION(BUILD_BBTK_DOC_DOXYGEN @@ -70,9 +70,9 @@ ENDIF(BBTK_USE_WXWIDGETS) #----------------------------------------------------------------------------- OPTION(BBTK_USE_KWWIDGETS "Build bbtk with KWWidgets ?" OFF) IF (BBTK_USE_KWWIDGETS) - SET(USE_KW ON CACHE BOOL "Use KWWidgets" FORCE) + SET(USE_KWWIDGETS ON CACHE BOOL "Use KWWidgets" FORCE) ELSE (BBTK_USE_KWWIDGETS) - SET(USE_KW OFF CACHE BOOL "Use KWWidgets" FORCE) + SET(USE_KWWIDGETS OFF CACHE BOOL "Use KWWidgets" FORCE) ENDIF (BBTK_USE_KWWIDGETS) #----------------------------------------------------------------------------- diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake index f5cc5d2..ce75260 100644 --- a/kernel/cmake/BBTKKernelConfig.cmake +++ b/kernel/cmake/BBTKKernelConfig.cmake @@ -20,7 +20,7 @@ IF(WIN32) # OR APPLE) SET (EXECUTABLE_OUTPUT_REL_PATH "") SET (LIBRARY_OUTPUT_REL_PATH "") IF(WIN32) - SET (ADDITIONAL_DLL_PATH "C:/CreaTools/lib" CACHE PATH "Additional paths in which to look for dlls") + SET (ADDITIONAL_DLL_PATH "C:/Program Files/CreaTools/crea_ThirdParty_dlls-0.2.0/bin" CACHE PATH "Additional paths in which to look for dlls") ENDIF(WIN32) ELSE(WIN32) # OR APPLE) SET (EXECUTABLE_OUTPUT_REL_PATH bin)