diff --git a/.gitlab/build.sh b/.gitlab/build.sh
index a3ef571a10ac7488299e1de34e8e040e9365662d..d1d1c3f0fad0f901b61ee0fc3d2ac3c78c3c23ff 100755
--- a/.gitlab/build.sh
+++ b/.gitlab/build.sh
@@ -59,7 +59,7 @@ case $SYSTEM in
 esac
 
 # Compile
-eval '${SCAN}cmake --build build-${VERSION} -j 4'
+eval '${SCAN}cmake --build build-${VERSION} -j 4 > /dev/null'
 
 # Install
 cmake --install build-${VERSION}
@@ -80,10 +80,8 @@ export FC=gfortran
 
 # Set the path variables
 if [[ "$SYSTEM" == "linux" ]]; then
-  #export LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:/usr/local/lib:$LIBRARY_PATH
-  #export LD_LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:/usr/local/lib:$LD_LIBRARY_PATH
-  export LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LIBRARY_PATH
-  export LD_LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LD_LIBRARY_PATH
+  export LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LIBRARY_PATH:/usr/local/lib
+  export LD_LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LD_LIBRARY_PATH:/usr/local/lib
 elif [[ "$SYSTEM" == "macosx" ]]; then
   export LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LIBRARY_PATH
   export DYLD_LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$DYLD_LIBRARY_PATH
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54275bb054632c724345c421450a8063c599cbf0..15f757a9e8721c2f39ab2bb62fdcf6b6347f5ccb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -766,7 +766,7 @@ add_custom_target(chameleon_all_sources ALL DEPENDS ${CHAMELEON_SOURCES_TARGETS}
 
 if(CHAMELEON_ENABLE_DOC)
   add_subdirectory(doc)
-  if (DOXYGEN_EXECUTABLE AND EMACS_COMPILER AND TEX_COMPILER)
+  if (DOXYGEN_EXECUTABLE AND EMACS_COMPILER)
     add_custom_target(doc ALL DEPENDS doc-homepage doxygen-out)
   endif()
 endif()
diff --git a/doc/dev/CMakeLists.txt b/doc/dev/CMakeLists.txt
index d086e2bce51cc66f8313a3b966370320f0074f8e..4f94bec91cabe32e835589ea711b8c8ddd2b43d2 100644
--- a/doc/dev/CMakeLists.txt
+++ b/doc/dev/CMakeLists.txt
@@ -30,7 +30,7 @@ cmake_minimum_required(VERSION 3.5)
 
 # Looking for doxygen
 # -------------------
-find_package(Doxygen)
+find_package(Doxygen REQUIRED)
 
 # Generate documentation
 # ----------------------
diff --git a/doc/user/CMakeLists.txt b/doc/user/CMakeLists.txt
index 635d662e6a93db6b329f1348445e555483ad3e28..34c0f8d8fa687de36c9b6239c0c737316c6815cf 100644
--- a/doc/user/CMakeLists.txt
+++ b/doc/user/CMakeLists.txt
@@ -68,10 +68,10 @@ endforeach()
 
 # Looking for emacs
 # -----------------
-FIND_PROGRAM(EMACS_COMPILER emacs)
-FIND_PROGRAM(TEX_COMPILER tex)
+find_program(EMACS_COMPILER emacs REQUIRED)
 
 if(EMACS_COMPILER)
+    message(STATUS "Looking for emacs - found")
 
     # Add target for homepage
     # -----------------------