diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5fe78d86..1cbfafdc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,7 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
   set(CMAKE_Fortran_FLAGS "-ffree-line-length-none -ffixed-line-length-none")
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
   set(CMAKE_Fortran_FLAGS "-extend-source 132")
+  set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -g -check bounds -check uninit -fpe0 -fno-alias -ftrapuv -traceback")
 else()
   message(WARNING "Fortran compiler with ID ${CMAKE_Fortran_COMPILER_ID} will be used with CMake default options")
 endif()
@@ -67,9 +68,16 @@ target_include_directories(ioapi PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINAR
 target_compile_definitions(ioapi PUBLIC SUBST_FILES_ID="FILES_CTM.EXT")
 target_link_libraries(ioapi PRIVATE esmf)
 
+# custom targets
+add_custom_target(aqm_mosaic
+                  COMMAND ${CMAKE_COMMAND} -E create_symlink
+                          ${CMAKE_CURRENT_BINARY_DIR}/mod/mosaic_module.mod
+                          ${CMAKE_CURRENT_BINARY_DIR}/mod/mosaic_mod.mod
+                  )
+
 # src/model
 add_library(CCTM OBJECT ${aqm_CCTM_files})
-add_dependencies(CCTM shr aqmio ioapi)
+add_dependencies(CCTM shr aqmio ioapi aqm_mosaic)
 set_target_properties(CCTM PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
 target_include_directories(CCTM PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
                                         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/model/CMAQ/CCTM/src/ICL/fixed/filenames>
@@ -105,12 +113,6 @@ add_library(aqm STATIC ${aqm_files} $<TARGET_OBJECTS:shr>
                          	    $<TARGET_OBJECTS:ioapi>
                          	    $<TARGET_OBJECTS:CCTM>)
 set_target_properties(aqm PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
-add_custom_target(aqm_mosaic
-                  COMMAND ${CMAKE_COMMAND} -E create_symlink
-                          ${CMAKE_CURRENT_BINARY_DIR}/mod/mosaic_module.mod
-                          ${CMAKE_CURRENT_BINARY_DIR}/mod/mosaic_mod.mod
-                  )
-add_dependencies(aqm aqm_mosaic)
 add_library(aqm::aqm ALIAS aqm)
 target_include_directories(aqm PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
                                       $<INSTALL_INTERFACE:mod>)