#2499 crea Feature New Normal - wt-version wtLibrary

diff --git a/cmake/CREAMacro_FindAndUseWt.cmake b/cmake/CREAMacro_FindAndUseWt.cmake
index 3896912cf887c61926e6be8938facc81d587d350..b3262b828c8fae3091a19fc880d4624a79255a45 100644 (file)
--- a/cmake/CREAMacro_FindAndUseWt.cmake
+++ b/cmake/CREAMacro_FindAndUseWt.cmake
@@ -1,11 +1,31 @@
 MACRO(CREA_FINDANDUSEWT)
+
+        
        SET (WT_CONNECTOR "wthttp" CACHE STRING "Connector used (wthttp or wtfcgi)")
        SET(WT_LIBRARIES wt wtfcgi wtext)
 #      SET(WT_LIBRARIES wt wthttp wtext)
-       INCLUDE_DIRECTORIES(/tmpEED/tmpWt/wtInstall/include)
-       LINK_DIRECTORIES(/tmpEED/tmpWt/wtInstall/lib)
+       INCLUDE_DIRECTORIES($ENV{WT_DIR}/../../include)
+       LINK_DIRECTORIES($ENV{WT_DIR}/../../lib/wt-3.3.4)
+
        CREA_DEFINE( USE_WT)
        CREA_DEFINE( _USE_WT_ )
+
+# FIND_PACKAGE(WT REQUIRED)
+#    IF(WT_FOUND)
+#      SET (WT_CONNECTOR "wthttp" CACHE STRING "Connector used (wthttp or wtfcgi)")
+#      SET(WT_LIBRARIES wt wtfcgi wtext)  
+#   ## SET(WT_LIBRARIES wt wthttp wtext)
+#      INCLUDE_DIRECTORIES(${WT_USE_FILE})
+#      LINK_DIRECTORIES(${WT_DIR})
+#      CREA_DEFINE( USE_WT)
+#      CREA_DEFINE( _USE_WT_ )
+#   ELSE(WT_FOUND)
+#      message(FATAL_ERROR "---------------------WT_DIR not found")
+#    ENDIF(VTK_FOUND)
+
+
+
+
 ENDMACRO(CREA_FINDANDUSEWT)