diff --git a/src/java/CMakeLists.txt b/src/java/CMakeLists.txt
index 0a86302..c967c01 100644
--- a/src/java/CMakeLists.txt
+++ b/src/java/CMakeLists.txt
@@ -31,7 +31,11 @@ else ()
   set (JAR $ENV{JAVA_HOME_NATIVE}/bin/jar)
 endif ()
 
-swig_add_module (mraajava java mraajava.i mraajni.c)
+if (CMAKE_VERSION VERSION_LESS "3.8")
+  swig_add_module (mraajava java mraajava.i ../mraajni.c)
+else ()
+  swig_add_library (mraajava LANGUAGE java SOURCES mraajava.i ../mraajni.c)
+endif ()
 swig_link_libraries (mraajava ${JAVA_LIBRARIES} mraa)
 
 add_custom_command (TARGET mraajava
diff --git a/src/javascript/CMakeLists.txt b/src/javascript/CMakeLists.txt
index aaf1fd6..ac63605 100644
--- a/src/javascript/CMakeLists.txt
+++ b/src/javascript/CMakeLists.txt
@@ -21,7 +21,11 @@ set_property (SOURCE mraajs.i PROPERTY SWIG_FLAGS "-node"
               "-I${CMAKE_BINARY_DIR}/src" "-DV8_VERSION=${V8_VERSION_HEX}")
 set_source_files_properties (mraajs.i PROPERTIES CPLUSPLUS ON)
 
-swig_add_module (mraajs javascript mraajs.i)
+if (CMAKE_VERSION VERSION_LESS "3.8")
+  swig_add_module (mraajs javascript mraajs.i)
+else ()
+  swig_add_library (mraajs LANGUAGE javascript SOURCES mraajs.i)
+endif ()
 swig_link_libraries (mraajs mraa)
 
 set_target_properties (mraajs PROPERTIES
diff --git a/src/python/python2/CMakeLists.txt b/src/python/python2/CMakeLists.txt
index 44ea7f7..464117a 100644
--- a/src/python/python2/CMakeLists.txt
+++ b/src/python/python2/CMakeLists.txt
@@ -3,7 +3,11 @@ set_source_files_properties (mraa2.i PROPERTIES SWIG_FLAGS "-I${CMAKE_BINARY_DIR
 
 message ("PYTHON2 attempting to build!")
 
-swig_add_module (python2-mraa python mraa2.i ../mraapy.c)
+if (CMAKE_VERSION VERSION_LESS "3.8")
+  swig_add_module (python2-mraa python mraa2.i ../mraapy.c)
+else ()
+  swig_add_library (python2-mraa LANGUAGE python SOURCES mraa2.i ../mraapy.c)
+endif ()
 swig_link_libraries (python2-mraa ${PYTHON2_LIBRARIES} mraa)
 
 target_include_directories(${SWIG_MODULE_python2-mraa_REAL_NAME}
diff --git a/src/python/python3/CMakeLists.txt b/src/python/python3/CMakeLists.txt
index b58a9e7..4706db7 100644
--- a/src/python/python3/CMakeLists.txt
+++ b/src/python/python3/CMakeLists.txt
@@ -3,7 +3,11 @@ set_source_files_properties (mraa3.i PROPERTIES SWIG_FLAGS "-I${CMAKE_BINARY_DIR
 
 message ("PYTHON3 attempting to build!")
 
-swig_add_module (python3-mraa python mraa3.i ../mraapy.c)
+if (CMAKE_VERSION VERSION_LESS "3.8")
+  swig_add_module (python3-mraa python mraa3.i ../mraapy.c)
+else ()
+  swig_add_library (python3-mraa LANGUAGE python SOURCES mraa3.i ../mraapy.c)
+endif ()
 swig_link_libraries (python3-mraa ${PYTHON3_LIBRARIES} mraa)
 
 target_include_directories(${SWIG_MODULE_python3-mraa_REAL_NAME}