From b2a9bead68ed3455a892784650b48bd2e7d65d84 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Thu, 6 Aug 2015 17:14:21 +0200 Subject: [PATCH] #2499 crea Feature New Normal - wt-version wtLibrary --- cmake/CREAMacro_FindAndUseWt.cmake | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/cmake/CREAMacro_FindAndUseWt.cmake b/cmake/CREAMacro_FindAndUseWt.cmake index 3896912..b3262b8 100644 --- 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) -- 2.47.1