diff --git a/Findasterx1_gps.cmake b/Findasterx1_gps.cmake
index 9390402dfad1554671980ea7ccee3672add5353b..f4aee7259c7c06399cb412964a77465b015a691d 100644
--- a/Findasterx1_gps.cmake
+++ b/Findasterx1_gps.cmake
@@ -1,17 +1,20 @@
 #edit the following line to add the librarie's header files
 FIND_PATH(asterx1_gps_INCLUDE_DIR asterx1_gps.h asterx1exceptions.h stream_gps.h gps_types.h /usr/local/include/iri/asterx1_gps /usr/include/iri/asterx1_gps)
 
-FIND_LIBRARY(asterx1_gps_LIBRARY
+FIND_LIBRARY(asterx1_gps_LIBRARIES
     NAMES asterx1_gps
     PATHS /usr/local/lib/iri/asterx1_gps /usr/lib/iri/asterx1_gps) 
 
-IF (asterx1_gps_INCLUDE_DIR AND asterx1_gps_LIBRARY)
+IF (asterx1_gps_INCLUDE_DIRS AND asterx1_gps_LIBRARIES)
    SET(asterx1_gps_FOUND TRUE)
-ENDIF (asterx1_gps_INCLUDE_DIR AND asterx1_gps_LIBRARY)
+ENDIF (asterx1_gps_INCLUDE_DIRS AND asterx1_gps_LIBRARIES)
+
+SET(asterx1_gps_INCLUDE_DIR ${asterx1_gps_INCLUDE_DIRS})
+SET(asterx1_gps_LIBRARY    ${asterx1_gps_LIBRARIES})
 
 IF (asterx1_gps_FOUND)
    IF (NOT asterx1_gps_FIND_QUIETLY)
-      MESSAGE(STATUS "Found asterx1_gps: ${asterx1_gps_LIBRARY}")
+      MESSAGE(STATUS "Found asterx1_gps: ${asterx1_gps_LIBRARIES}")
    ENDIF (NOT asterx1_gps_FIND_QUIETLY)
 ELSE (asterx1_gps_FOUND)
    IF (asterx1_gps_FIND_REQUIRED)
diff --git a/Findasterx1_process.cmake b/Findasterx1_process.cmake
index a6ae593318667fed32fcd96e9315493bac209d5a..475671151aca2d9f7b1f8a635098b9a5256aea9c 100644
--- a/Findasterx1_process.cmake
+++ b/Findasterx1_process.cmake
@@ -1,17 +1,20 @@
 #edit the following line to add the librarie's header files
 FIND_PATH(asterx1_process_INCLUDE_DIR asterx1_process.h gps_types.h /usr/local/include/iri/asterx1_gps /usr/include/iri/asterx1_gps)
 
-FIND_LIBRARY(asterx1_process_LIBRARY
+FIND_LIBRARY(asterx1_process_LIBRARIES
     NAMES asterx1_process
     PATHS /usr/local/lib/iri/asterx1_gps /usr/lib/iri/asterx1_gps) 
 
-IF (asterx1_process_INCLUDE_DIR AND asterx1_process_LIBRARY)
+IF (asterx1_process_INCLUDE_DIRS AND asterx1_process_LIBRARIES)
    SET(asterx1_process_FOUND TRUE)
-ENDIF (asterx1_process_INCLUDE_DIR AND asterx1_process_LIBRARY)
+ENDIF (asterx1_process_INCLUDE_DIRS AND asterx1_process_LIBRARIES)
+
+SET(asterx1_process_INCLUDE_DIR ${asterx1_process_INCLUDE_DIRS})
+SET(asterx1_process_LIBRARY    ${asterx1_process_LIBRARIES})
 
 IF (asterx1_process_FOUND)
    IF (NOT asterx1_process_FIND_QUIETLY)
-      MESSAGE(STATUS "Found asterx1_process: ${asterx1_process_LIBRARY}")
+      MESSAGE(STATUS "Found asterx1_process: ${asterx1_process_LIBRARIES}")
    ENDIF (NOT asterx1_process_FIND_QUIETLY)
 ELSE (asterx1_process_FOUND)
    IF (asterx1_process_FIND_REQUIRED)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 804091efd707e63c9196fa7937d25cc93a5aa330..2d85f7dc010b4f2603061c31fc948bbb751963e7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,15 +16,15 @@ FIND_PACKAGE(comm)
 
 # add the necessary include directories
 INCLUDE_DIRECTORIES(../include/)
-INCLUDE_DIRECTORIES(${iriutils_INCLUDE_DIR})
-INCLUDE_DIRECTORIES(${comm_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${iriutils_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${comm_INCLUDE_DIRS})
 
 # create the shared library
 ADD_LIBRARY(asterx1_gps SHARED ${sources})
 
 # link necessary libraries
-TARGET_LINK_LIBRARIES(asterx1_gps ${iriutils_LIBRARY})
-TARGET_LINK_LIBRARIES(asterx1_gps ${comm_LIBRARY})
+TARGET_LINK_LIBRARIES(asterx1_gps ${iriutils_LIBRARIES})
+TARGET_LINK_LIBRARIES(asterx1_gps ${comm_LIBRARIES})
 
 INSTALL(TARGETS asterx1_gps
         RUNTIME DESTINATION bin
@@ -43,8 +43,8 @@ IF(gpstk_LIBRARY)
   # create the shared library
   ADD_LIBRARY(asterx1_process SHARED ${process_sources})
 
-  TARGET_LINK_LIBRARIES(asterx1_process ${iriutils_LIBRARY})
-  TARGET_LINK_LIBRARIES(asterx1_process ${comm_LIBRARY})
+  TARGET_LINK_LIBRARIES(asterx1_process ${iriutils_LIBRARIES})
+  TARGET_LINK_LIBRARIES(asterx1_process ${comm_LIBRARIES})
   TARGET_LINK_LIBRARIES(asterx1_process gpstk)
 
   INSTALL(TARGETS asterx1_process