#2499 crea Feature New Normal - wt-version wtLibrary

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index a80df2960eb90dac7cc74696da3d9c57871ddb5f..d60b46335c289a02b948c1ab750045fb928a3336 100644 (file)
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -26,6 +26,7 @@ ENDIF(USE_CREA)
 
 
 #-----------------------------------------------------------------------------
+
 IF(USE_QT4)
   IF(NOT QT_FOUND)     
   
@@ -40,13 +41,18 @@ IF(USE_QT4)
       INCLUDE(${QT_USE_FILE})
         
       CREA_DEFINE( USE_QT )
-    #    SET(QT_LIBRARIES
-    #         ${QT_LIBRARIES}
-    #      ) 
-    #  MARK_AS_ADVANCED(Qt4_DIR)
+
    ENDIF(QT_FOUND)
   ENDIF(NOT QT_FOUND)
 ENDIF(USE_QT4)
+
+
+#JFGA Pruebas WT
+
+MESSAGE (  "======================================= SET CMAKE USE_WT JFGA CREAMacro_FindAndUseLibraries.cmake")   
+SET(USE_WT ON)
+
+
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -250,6 +256,13 @@ ENDIF(USE_GDCM2)
 
 #-----------------------------------------------------------------------------
 
+#-------------------- JFGA ---
+IF(USE_WT)
+       MESSAGE (  "======================================= JFGA ------------USE WT CREAMacro_FindAndUseLibraries.cmake")
+       INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseWt.cmake)
+       CREA_FINDANDUSEWT()
+ENDIF(USE_WT)
+
 #-----------------------------------------------------------------------------
 IF(USE_WXWIDGETS)
   IF(NOT wxWidgets_FOUND)

diff --git a/cmake/CREAMacro_FindAndUseWt.cmake b/cmake/CREAMacro_FindAndUseWt.cmake
new file mode 100644 (file)
index 0000000..4f63644
--- /dev/null
+++ b/cmake/CREAMacro_FindAndUseWt.cmake
@@ -0,0 +1,9 @@
+MACRO(CREA_FINDANDUSEWT)
+       SET (WT_CONNECTOR "wthttp" CACHE STRING "Connector used (wthttp or wtfcgi)")
+       SET(WT_LIBRARIES wt wthttp)
+       INCLUDE_DIRECTORIES(/usr/local/include/Wt)
+       CREA_DEFINE( USE_WT)
+       CREA_DEFINE( _USE_WT_ )
+ENDMACRO(CREA_FINDANDUSEWT)
+
+

diff --git a/lib/creaDevManagerLib/wxCDMNewBlackBoxDialog.cpp b/lib/creaDevManagerLib/wxCDMNewBlackBoxDialog.cpp
index c1542881aebf1afa9a6e4a4b37bf18cc4c872e64..b48d187766f07c6f2ad236faddfd260962f39f57 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMNewBlackBoxDialog.cpp
+++ b/lib/creaDevManagerLib/wxCDMNewBlackBoxDialog.cpp
@@ -180,9 +180,12 @@ void wxCDMNewBlackBoxDialog::CreateControls()
           wxT("Basic - AtomicBlackBox"),
                  wxT("Widget - WxBlackBox"),
           wxT("VTK ImageAlgorithm - Basic and vtkImageAlgorithm (standard vtk I/O)"),
-          wxT("VTK PolyDataAlgorithm - Basic and vtkPolyDataAlgorithm (standard vtk I/O)")
+          wxT("VTK PolyDataAlgorithm - Basic and vtkPolyDataAlgorithm (standard vtk I/O)"),
+//JFGA new type added
+         wxT("Web Widget - WtBlackBox")
+       
       };
-  this->blackBoxType = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 4, BBTypes);
+  this->blackBoxType = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 5, BBTypes);
 
   wxString BBFormats[] =
       {

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9aa86e45a618ce2feb834bc42fcde85fdeaabc0b..c9a15681e2b96006e04213dbc3fdac78c5367665 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -73,7 +73,8 @@ ADD_LIBRARY(crea ${CREA_BUILD_SHARED} ${SRCS})
 TARGET_LINK_LIBRARIES(crea
   ${WXWIDGETS_LIBRARIES}
   ${VTK_LIBRARIES}
-  ${BOOST_LIBRARIES}  
+  ${BOOST_LIBRARIES}
+
 )
 
 SET_TARGET_PROPERTIES(crea PROPERTIES ${CREA_LIBRARY_PROPERTIES})