diff --git a/bindings/r/CMakeLists.txt b/bindings/r/CMakeLists.txt
index cdedb9840fb5e691d5f37379c2c2a92501cd717c..4493fac8b9f102417c3308abfdc48ca7fe9998ea 100644
--- a/bindings/r/CMakeLists.txt
+++ b/bindings/r/CMakeLists.txt
@@ -1,25 +1,35 @@
############################################################################
# CMakeLists.txt file for building ROOT R package
############################################################################
-#Autor: Omar Andres Zapata Mesa 31/05/2013,14/07/2014
-
-set(libname RInterface)
-
-include_directories(${R_INCLUDE_DIRS})
-
-ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -Wno-overloaded-virtual)
-
-set(R_HEADERS ${CMAKE_SOURCE_DIR}/bindings/r/inc/TRInterface.h
- ${CMAKE_SOURCE_DIR}/bindings/r/inc/TRObject.h
- ${CMAKE_SOURCE_DIR}/bindings/r/inc/TRFunctionExport.h
- ${CMAKE_SOURCE_DIR}/bindings/r/inc/TRFunctionImport.h
- ${CMAKE_SOURCE_DIR}/bindings/r/inc/TRInternalFunction.h
- ${CMAKE_SOURCE_DIR}/bindings/r/inc/TRDataFrame.h
- ${CMAKE_SOURCE_DIR}/bindings/r/inc/RExports.h)
ROOT_STANDARD_LIBRARY_PACKAGE(RInterface
- HEADERS ${R_HEADERS}
- LIBRARIES ${R_LIBRARIES} readline
- DICTIONARY_OPTIONS -I${R_INCLUDE_DIR}
- DEPENDENCIES Core Matrix Thread RIO)
-target_include_directories(RInterface BEFORE PRIVATE ${R_INCLUDE_DIR})
+ HEADERS
+ RExports.h
+ TRDataFrame.h
+ TRFunctionExport.h
+ TRFunctionImport.h
+ TRInterface.h
+ TRInternalFunction.h
+ TRObject.h
+ SOURCES
+ src/RExports.cxx
+ src/TRCompletion.cxx
+ src/TRDataFrame.cxx
+ src/TRFunctionExport.cxx
+ src/TRFunctionImport.cxx
+ src/TRInterface.cxx
+ src/TRObject.cxx
+ DICTIONARY_OPTIONS
+ -I${R_INCLUDE_DIR}
+ -I${R_Rcpp_INCLUDE_DIR}
+ -I${R_RInside_INCLUDE_DIR}
+ DEPENDENCIES
+ Core
+ Matrix
+ RIO
+ Thread
+)
+
+target_compile_options(RInterface PUBLIC -Wno-cast-function-type -Wno-overloaded-virtual)
+target_include_directories(RInterface BEFORE PUBLIC ${R_INCLUDE_DIRS})
+target_link_libraries(RInterface PUBLIC ${R_LIBRARIES} readline)