X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FCREAMacro_FindAndUseWt.cmake;h=ce3fddd3cb147725f3179d0c69ec8f29ad627760;hb=f4f00852f96abfadb23ba8ac122d8377a0396768;hp=3896912cf887c61926e6be8938facc81d587d350;hpb=cf2e11cdafb5f71b1f978f06b08a1478d4cdcfa1;p=crea.git

diff --git a/cmake/CREAMacro_FindAndUseWt.cmake b/cmake/CREAMacro_FindAndUseWt.cmake
index 3896912..ce3fddd 100644
--- a/cmake/CREAMacro_FindAndUseWt.cmake
+++ b/cmake/CREAMacro_FindAndUseWt.cmake
@@ -1,11 +1,37 @@
 MACRO(CREA_FINDANDUSEWT)
+
+        
 	SET (WT_CONNECTOR "wthttp" CACHE STRING "Connector used (wthttp or wtfcgi)")
-	SET(WT_LIBRARIES wt wtfcgi wtext)
+
+#EED2019-08-20
+#	SET(WT_LIBRARIES wt wtfcgi wtext)
+	SET(WT_LIBRARIES wt wtfcgi )
+
 #	SET(WT_LIBRARIES wt wthttp wtext)
-	INCLUDE_DIRECTORIES(/tmpEED/tmpWt/wtInstall/include)
-	LINK_DIRECTORIES(/tmpEED/tmpWt/wtInstall/lib)
+	INCLUDE_DIRECTORIES($ENV{WT_DIR}/../../include)
+
+#EED2019-08-20
+#	LINK_DIRECTORIES($ENV{WT_DIR}/../../lib/wt-3.3.4)
+	LINK_DIRECTORIES($ENV{WT_DIR}/../../lib/wt-4.0.4-rc1)
+
+
 	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(WT_FOUND)
+
+
 ENDMACRO(CREA_FINDANDUSEWT)