diff --git a/CMake/FindPVSS.cmake b/CMake/FindPVSS.cmake
index 806344d1192e3bd310034a45fdeed8d79b907a21..bd57bbb7836c5d189dc1bfc7eddde59ffac54378 100644
--- a/CMake/FindPVSS.cmake
+++ b/CMake/FindPVSS.cmake
@@ -112,17 +112,16 @@ if(NOT PVSS_FOUND)
   find_package_handle_standard_args(PVSS DEFAULT_MSG ${pvss_check_list})
   
   # Now it's time to fill the non-cached variables
-  set(PVSS_DEFINITIONS)
-  foreach(def ${pvss_definitions})
-    set(PVSS_DEFINITIONS "${PVSS_DEFINITIONS} ${def}")
-  endforeach(def ${pvss_definitions})
-  set(PVSS_INCLUDE_DIRS)
-  foreach(dir ${pvss_include_dirs})
-    list(APPEND PVSS_INCLUDE_DIRS ${PVSS_INCLUDE_DIR}/${dir})
-  endforeach(dir ${pvss_include_dirs})
-  set(PVSS_LIBRARIES)
-  foreach(lib ${pvss_libraries})
-    list(APPEND PVSS_LIBRARIES ${PVSS_${lib}_LIBRARY})
-  endforeach(lib ${pvss_libraries})
-   
+  if(PVSS_FOUND)
+    foreach(def ${pvss_definitions})
+      set(PVSS_DEFINITIONS "${PVSS_DEFINITIONS} ${def}")
+    endforeach(def ${pvss_definitions})
+    foreach(dir ${pvss_include_dirs})
+      list(APPEND PVSS_INCLUDE_DIRS ${PVSS_INCLUDE_DIR}/${dir})
+    endforeach(dir ${pvss_include_dirs})
+    foreach(lib ${pvss_libraries})
+      list(APPEND PVSS_LIBRARIES ${PVSS_${lib}_LIBRARY})
+    endforeach(lib ${pvss_libraries})
+  endif(PVSS_FOUND)
+
 endif(NOT PVSS_FOUND)
diff --git a/CMake/variants/variants.kis001 b/CMake/variants/variants.kis001
index ef3221faec4cb57948713a75d4380b8c3a96fc2b..bdd434ff7d5f7a96bec3e08deef03a477a82ab69 100644
--- a/CMake/variants/variants.kis001
+++ b/CMake/variants/variants.kis001
@@ -1 +1,2 @@
 set(PVSS_ROOT_DIR /opt/pvss/pvss2_v3.7)
+set(PVSS_DEFINITIONS "-Wno-deprecated -Wno-extra -Wno-overloaded-virtual")