diff --git a/vlsisapd/cmake_modules/FindVLSISAPD.cmake b/vlsisapd/cmake_modules/FindVLSISAPD.cmake
index 35621cc1..7bad25d9 100644
--- a/vlsisapd/cmake_modules/FindVLSISAPD.cmake
+++ b/vlsisapd/cmake_modules/FindVLSISAPD.cmake
@@ -5,10 +5,9 @@
 #  VLSISAPD_INCLUDE_DIR - the VLSISAPD include directory
 #  VLSISAPD_LIBRARIES   - The libraries needed to use VLSISAPD
 
- set(VLSISAPD_FOUND FALSE)
+ set(VLSISAPD_FOUND TRUE)
  setup_search_dir(CORIOLIS)
 
- if(CORIOLIS_DIR_SEARCH)
   #MESSAGE("--   CORIOLIS_DIR_SEARCH: ${CORIOLIS_DIR_SEARCH}")
 
   # Utilities
@@ -58,27 +57,4 @@
     FIND_LIBRARY(CONFIGURATION_LIBRARY     NAMES configuration                                PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES lib64 lib)
     SET_FOUND   (CONFIGURATION)
     MESSAGE("--   Configuration: ${CONFIGURATION_LIBRARY}")
-    
-    IF(AGDS_FOUND OR CIF_FOUND OR OPENCHAMS_FOUND OR DTR_FOUND OR SPICE_FOUND)
-        SET(VLSISAPD_FOUND TRUE)
-    ELSE(AGDS_FOUND OR CIF_FOUND OR OPENCHAMS_FOUND OR DTR_FOUND OR SPICE_FOUND)
-        SET(VLSISAPD_FOUND FALSE)
-    ENDIF(AGDS_FOUND OR CIF_FOUND OR OPENCHAMS_FOUND OR DTR_FOUND OR SPICE_FOUND)
-ELSE(CORIOLIS_DIR_SEARCH)
-    MESSAGE("-- Cannot find VLSISAPD_LIBRARIES since CORIOLIS_DIR_SEARCH is not defined.")
-ENDIF(CORIOLIS_DIR_SEARCH)
-
-IF (NOT VLSISAPD_FOUND)
-    SET(VLSISAPD_MESSAGE
-    "VLSISAPD libraries were not found. Make sure CORIOLIS_TOP env variable is set.")
-    IF (NOT VLSISAPD_FIND_QUIETLY)
-        MESSAGE(STATUS "${VLSISAPD_MESSAGE}")
-    ELSE(NOT VLSISAPD_FIND_QUIETLY)
-        IF(VLSISAPD_FIND_REQUIRED)
-            MESSAGE(FATAL_ERROR "${VLSISAPD_MESSAGE}")
-        ENDIF(VLSISAPD_FIND_REQUIRED)
-    ENDIF(NOT VLSISAPD_FIND_QUIETLY)
-ELSE (NOT VLSISAPD_FOUND)
-    MESSAGE(STATUS "VLSISAPD library was found in ${CORIOLIS_DIR_SEARCH}")
-ENDIF (NOT VLSISAPD_FOUND)