Timer fixes

CMakeLists.txt

@@ -36,9 +36,13 @@ if(BUILD_DOC)
     endif (DOXYGEN_FOUND)
 endif(BUILD_DOC)
 
-if (SFX_CHECK_NAN)
+if(SFX_CHECK_NAN)
     add_definitions(-DSFX_CHECK_NAN)
-endif ()
+endif(SFX_CHECK_NAN)
+
+if(USE_JIKAN_TIMER)
+    add_definitions(-DUSE_JIKAN_TIMER)
+endif(USE_JIKAN_TIMER)
 
 set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/modules)
 
@@ -196,6 +200,12 @@ endif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
 # set(CMAKE_Fortran_ARCHIVE_FINISH  "$<CMAKE_RANLIB> -no_warning_for_no_symbols -c $<TARGET>")
 target_include_directories(sfx_lib PUBLIC ${CMAKE_BINARY_DIR}/modules/)
 
+if(USE_JIKAN_TIMER)
+    target_include_directories(sfx PUBLIC ${CMAKE_BINARY_DIR}/jikan_modules/)
+    target_include_directories(sfx_lib PUBLIC ${CMAKE_BINARY_DIR}/jikan_modules/)
+endif(USE_JIKAN_TIMER)
+
+
 if(VTUNE_FLAGS)
     target_compile_options(sfx
         PUBLIC $<$<COMPILE_LANGUAGE:C>: -g -O2 -Xsprofile>