diff --git a/asibfm700/CMakeLists.txt b/asibfm700/CMakeLists.txt
index 4639d8e..b80b64e 100644
--- a/asibfm700/CMakeLists.txt
+++ b/asibfm700/CMakeLists.txt
@@ -8,7 +8,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
 
-find_package(ASIO QUIET CONFIG)
+# find_package(ASIO QUIET CONFIG)
+find_package(ASIO QUIET)
 if (ASIO_FOUND)
     message(STATUS "ASIO library was found in the host system")
 else()
diff --git a/cmake/FindASIO.cmake b/cmake/FindASIO.cmake
index aed1276..46aec45 100644
--- a/cmake/FindASIO.cmake
+++ b/cmake/FindASIO.cmake
@@ -6,13 +6,22 @@ set(ASIO_FOUND FALSE)
 
 find_package(Threads REQUIRED)
 
-find_path(ASIO_DIR asio.hpp HINTS ${ASIO_INSTALL_DIR} PATH_SUFFIXES include)
+set(ASIO_INSTALL_DIR "" CACHE STRING "ASIO install dir")
+set(ASIO_INSTALL_DIR_INTERNAL "" CACHE STRING "ASIO install dir")
+if(NOT "${ASIO_INSTALL_DIR}" STREQUAL "${ASIO_INSTALL_DIR_INTERNAL}") # ASIO_INSTALL_DIR is given in command-line
+    unset(ASIO_INCLUDE_DIR CACHE)
+    find_path(ASIO_DIR asio.hpp HINTS ${ASIO_INSTALL_DIR} PATH_SUFFIXES include)
+else() # in system path
+    find_path(ASIO_DIR asio.hpp PATH_SUFFIXES include)
+endif()
+
+
 
 if (NOT ASIO_DIR)
     message(WARNING "Cannot find ASIO library headers!")
     set(ASIO_FOUND FALSE)
 else()
-    message(STATUS "Found ASIO: TRUE (${ASIO_DIR})")
+    message(STATUS "Found ASIO: (${ASIO_DIR})")
 
     # ASIO is header-only library so it is IMPORTED target
     add_library(ASIO::ASIO INTERFACE IMPORTED GLOBAL)
diff --git a/mcc/CMakeLists.txt b/mcc/CMakeLists.txt
index adb7c38..fa3a971 100644
--- a/mcc/CMakeLists.txt
+++ b/mcc/CMakeLists.txt
@@ -62,7 +62,8 @@ set_target_properties(ERFA_LIB PROPERTIES IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/
 add_dependencies(ERFA_LIB erfalib)
 set(ERFA_INCLUDE_DIR ${CMAKE_BINARY_DIR}/erfa_lib)
 # set(ERFA_LIBFILE ${CMAKE_BINARY_DIR}/erfa_lib/liberfa.a PARENT_SCOPE)
-# include_directories(${ERFA_INCLUDE_DIR})
+include_directories(${ERFA_INCLUDE_DIR})
+message(STATUS "ERFA INCLUDE DIR: " ${ERFA_INCLUDE_DIR})
 
 add_subdirectory(bsplines)
 message(STATUS "BSPLINES_INCLUDE_DIR: " ${BSPLINES_INCLUDE_DIR})
@@ -80,7 +81,7 @@ set(MCC_LIBRARY mcc)
 add_library(${MCC_LIBRARY} INTERFACE ${MCC_LIBRARY_SRC})
 target_compile_features(${MCC_LIBRARY} INTERFACE cxx_std_23)
 target_compile_definitions(${MCC_LIBRARY} INTERFACE SPDLOG_USE_STD_FORMAT=1 SPDLOG_FMT_EXTERNAL=0)
-target_link_libraries(${MCC_LIBRARY} INTERFACE spdlog Threads::Threads atomic)
+target_link_libraries(${MCC_LIBRARY} INTERFACE spdlog Threads::Threads atomic ${ERFA_LIB})
 target_include_directories(${MCC_LIBRARY} INTERFACE ${ERFA_INCLUDE_DIR} ${BSPLINES_INCLUDE_DIR})
 target_include_directories(${MCC_LIBRARY} INTERFACE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>