-#OPTION(SALOME_BUILD_DOC "Generate SALOME ATOMSOLV documentation" ${SALOME_BUILD_DOC}) For use in the future
-#OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ${SALOME_BUILD_TESTS}) For use in the future
+#OPTION(SALOME_BUILD_DOC "Generate SALOME ATOMSOLV documentation" ON) #for use in the future
+OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON)
+
+IF(SALOME_BUILD_TESTS)
+ ENABLE_TESTING()
+ENDIF()
+
+##
+## From KERNEL:
+##
+FIND_PACKAGE(SalomePythonInterp REQUIRED)
+FIND_PACKAGE(SalomePythonLibs REQUIRED)
+FIND_PACKAGE(SalomeOmniORB REQUIRED)
+FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
+FIND_PACKAGE(SalomePThread REQUIRED)