Index: cmake/FindCLucene.cmake
===================================================================
--- cmake/FindCLucene.cmake	(revision 1152)
+++ cmake/FindCLucene.cmake	(working copy)
@@ -27,6 +27,18 @@
   INCLUDE(${PROJECT_CMAKE}/CLuceneConfig.cmake)
 ENDIF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
 
+IF(MSVC)
+  IF(CMAKE_BUILD_TYPE STREQUAL "Release")
+    SET(WIN_CLUCENE_SEARCH_PATH ../clucene-core-0.9.21b/src/CLucene/Release)
+  ELSE(CMAKE_BUILD_TYPE STREQUAL "Release")
+    SET(WIN_CLUCENE_SEARCH_PATH ../clucene-core-0.9.21b/src/CLucene/debug)
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL "Release")
+  SET(WIN_CLUCENE_INCLUDE_PATH ../clucene-core-0.9.21b/src)
+ELSE(MSVC)
+  SET(WIN_CLUCENE_SEARCH_PATH "")
+  SET(WIN_CLUCENE_INCLUDE_PATH "")
+ENDIF(MSVC)
+
 SET(TRIAL_LIBRARY_PATHS
   $ENV{CLUCENE_HOME}/lib${LIB_SUFFIX}
   ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
@@ -36,6 +48,7 @@
   /usr/lib64
   /sw/lib${LIB_SUFFIX}
   /usr/pkg/lib${LIB_SUFFIX}
+  ${WIN_CLUCENE_SEARCH_PATH}
   )
 SET(TRIAL_INCLUDE_PATHS
   $ENV{CLUCENE_HOME}/include
@@ -44,9 +57,9 @@
   /usr/include
   /sw/include
   /usr/pkg/include
+  ${WIN_CLUCENE_INCLUDE_PATH}
   )
 FIND_LIBRARY_WITH_DEBUG(CLUCENE_LIBRARY
-  WIN32_DEBUG_POSTFIX d
   NAMES clucene clucene-core
   PATHS ${TRIAL_LIBRARY_PATHS})
 IF (CLUCENE_LIBRARY)
Index: cmake/FindSword.cmake
===================================================================
--- cmake/FindSword.cmake	(revision 1152)
+++ cmake/FindSword.cmake	(working copy)
@@ -16,11 +16,14 @@
     /usr/lib${LIB_SUFFIX}
     /usr/local/lib${LIB_SUFFIX}
     /sw/lib${LIB_SUFFIX}
+    ../sword-1.5.11/lib/vcppmake/vc8/ICUDebug
+    ../sword-1.5.11/lib/vcppmake/vc8/ICURelease
   ) 
   SET(TRIAL_INCLUDE_PATHS
     $ENV{SWORD_HOME}/include
     ${CMAKE_INSTALL_PREFIX}/include
     /sw/include
+    ../sword-1.5.11/include
   ) 
 
   FIND_LIBRARY(SWORD_LIBRARY sword
@@ -30,7 +33,7 @@
     MESSAGE(STATUS "Found CLucene library: ${CLUCENE_LIBRARY}")
   ENDIF (SWORD_LIBRARY)
   FIND_PATH(SWORD_INCLUDE_DIR
-      NAMES sword/swmgr.h
+      NAMES swmgr.h
       PATHS ${TRIAL_INCLUDE_PATHS})
 
   IF (SWORD_INCLUDE_DIR)
@@ -77,7 +80,7 @@
 
 ENDIF (WIN32)
 
-SET(SWORD_INCLUDE_DIR "${SWORD_INCLUDE_DIR}/sword")
+#SET(SWORD_INCLUDE_DIR "${SWORD_INCLUDE_DIR}/sword")
 MESSAGE(STATUS "Sword include directory is ${SWORD_INCLUDE_DIR}")
 
 IF (MULTIVERSE_SWORD_OK EQUAL 0)
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 1152)
+++ CMakeLists.txt	(working copy)
@@ -56,12 +56,12 @@
 # The actual build options
 #
 INCLUDE_DIRECTORIES(
+	${CMAKE_CURRENT_BINARY_DIR}		#for .h files generated from .ui
+	${CMAKE_CURRENT_SOURCE_DIR}/src	# so that include paths like "frontend/..." work
 	${CLUCENE_INCLUDE_DIR}			#CLucene headers
 	${CLUCENE_LIBRARY_DIR}			#CLucene/clucene-config.h
 	${Boost_INCLUDE_DIRS}
 	${SWORD_INCLUDE_DIR}
-	${CMAKE_CURRENT_BINARY_DIR}		#for .h files generated from .ui
-	${CMAKE_CURRENT_SOURCE_DIR}/src	# so that include paths like "frontend/..." work
 )