diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
index e014fad..e4ed3ef 100644
--- a/src/python/CMakeLists.txt
+++ b/src/python/CMakeLists.txt
@@ -1,5 +1,9 @@
 set_source_files_properties (mraapython.i PROPERTIES CPLUSPLUS ON)
 set_source_files_properties (mraapython.i PROPERTIES SWIG_FLAGS "-I${CMAKE_BINARY_DIR}/src")
 
-add_subdirectory (python2)
-add_subdirectory (python3)
+if (PYTHON2_LIBRARY)
+  add_subdirectory (python2)
+endif ()
+if (PYTHON3_LIBRARY)
+  add_subdirectory (python3)
+endif ()
diff --git a/src/python/python2/CMakeLists.txt b/src/python/python2/CMakeLists.txt
index 8c48c39..44ea7f7 100644
--- a/src/python/python2/CMakeLists.txt
+++ b/src/python/python2/CMakeLists.txt
@@ -1,37 +1,35 @@
 set_source_files_properties (mraa2.i PROPERTIES CPLUSPLUS ON)
 set_source_files_properties (mraa2.i PROPERTIES SWIG_FLAGS "-I${CMAKE_BINARY_DIR}/src")
 
-if (PYTHON2_LIBRARY)
-    message ("PYTHON2 attempting to build!")
+message ("PYTHON2 attempting to build!")
 
-    swig_add_module (python2-mraa python mraa2.i ../mraapy.c)
-    swig_link_libraries (python2-mraa ${PYTHON2_LIBRARIES} mraa)
-    
-    target_include_directories(${SWIG_MODULE_python2-mraa_REAL_NAME}
-      PUBLIC
-      "${CMAKE_CURRENT_SOURCE_DIR}/../.."
-      "${PYTHON2_INCLUDE_DIR}"
-    )
+swig_add_module (python2-mraa python mraa2.i ../mraapy.c)
+swig_link_libraries (python2-mraa ${PYTHON2_LIBRARIES} mraa)
 
-    if (DOXYGEN_FOUND AND PYTHON2_EXECUTABLE)
-      foreach (_file ${DOCCLASSES})
-        add_dependencies (${SWIG_MODULE_python2-mraa_REAL_NAME} ${_file}class_doc_i)
-      endforeach ()
-      add_dependencies (${SWIG_MODULE_python2-mraa_REAL_NAME} common_hpp_doc_i)
-    endif ()
+target_include_directories(${SWIG_MODULE_python2-mraa_REAL_NAME}
+  PUBLIC
+  "${CMAKE_CURRENT_SOURCE_DIR}/../.."
+  "${PYTHON2_INCLUDE_DIR}"
+)
 
-    set_target_properties (${SWIG_MODULE_python2-mraa_REAL_NAME} PROPERTIES
-      OUTPUT_NAME _mraa
-      COMPILE_FLAGS "${CMAKE_C_FLAGS} -DSWIGPYTHON=${SWIG_FOUND} -DSWIGPYTHON2=${SWIG_FOUND}"
-    )
+if (DOXYGEN_FOUND AND PYTHON2_EXECUTABLE)
+  foreach (_file ${DOCCLASSES})
+	add_dependencies (${SWIG_MODULE_python2-mraa_REAL_NAME} ${_file}class_doc_i)
+  endforeach ()
+  add_dependencies (${SWIG_MODULE_python2-mraa_REAL_NAME} common_hpp_doc_i)
+endif ()
 
-    install (TARGETS ${SWIG_MODULE_python2-mraa_REAL_NAME}
-      DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYTHON2_PACKAGES_PATH}
-    )
+set_target_properties (${SWIG_MODULE_python2-mraa_REAL_NAME} PROPERTIES
+  OUTPUT_NAME _mraa
+  COMPILE_FLAGS "${CMAKE_C_FLAGS} -DSWIGPYTHON=${SWIG_FOUND} -DSWIGPYTHON2=${SWIG_FOUND}"
+)
 
-    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/mraa.py
-      DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYTHON2_PACKAGES_PATH}
-    )
-endif()
+install (TARGETS ${SWIG_MODULE_python2-mraa_REAL_NAME}
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYTHON2_PACKAGES_PATH}
+)
+
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/mraa.py
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYTHON2_PACKAGES_PATH}
+)
 
 add_subdirectory (docs)
diff --git a/src/python/python3/CMakeLists.txt b/src/python/python3/CMakeLists.txt
index 6c3846b..2c3d705 100644
--- a/src/python/python3/CMakeLists.txt
+++ b/src/python/python3/CMakeLists.txt
@@ -1,28 +1,26 @@
 set_source_files_properties (mraa3.i PROPERTIES CPLUSPLUS ON)
 set_source_files_properties (mraa3.i PROPERTIES SWIG_FLAGS "-I${CMAKE_BINARY_DIR}/src")
 
-if (PYTHON3_LIBRARY)
-    message ("PYTHON3 attempting to build!")
+message ("PYTHON3 attempting to build!")
 
-    swig_add_module (python3-mraa python mraa3.i ../mraapy.c)
-    swig_link_libraries (python3-mraa ${PYTHON3_LIBRARIES} mraa)
+swig_add_module (python3-mraa python mraa3.i ../mraapy.c)
+swig_link_libraries (python3-mraa ${PYTHON3_LIBRARIES} mraa)
 
-    target_include_directories(${SWIG_MODULE_python3-mraa_REAL_NAME}
-      PUBLIC
-      "${CMAKE_CURRENT_SOURCE_DIR}/../.."
-      "${PYTHON3_INCLUDE_DIR}"
-    )
+target_include_directories(${SWIG_MODULE_python3-mraa_REAL_NAME}
+  PUBLIC
+  "${CMAKE_CURRENT_SOURCE_DIR}/../.."
+  "${PYTHON3_INCLUDE_DIR}"
+)
 
-    set_target_properties (${SWIG_MODULE_python3-mraa_REAL_NAME} PROPERTIES
-      OUTPUT_NAME _mraa
-      COMPILE_FLAGS "${CMAKE_C_FLAGS} -DSWIGPYTHON=${SWIG_FOUND} -DDSWIGPYTHON3=${SWIG_FOUND}"
-    )
+set_target_properties (${SWIG_MODULE_python3-mraa_REAL_NAME} PROPERTIES
+  OUTPUT_NAME _mraa
+  COMPILE_FLAGS "${CMAKE_C_FLAGS} -DSWIGPYTHON=${SWIG_FOUND} -DDSWIGPYTHON3=${SWIG_FOUND}"
+)
 
-    install (TARGETS ${SWIG_MODULE_python3-mraa_REAL_NAME}
-      DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYTHON3_PACKAGES_PATH}
-    )
+install (TARGETS ${SWIG_MODULE_python3-mraa_REAL_NAME}
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYTHON3_PACKAGES_PATH}
+)
 
-    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/mraa.py
-      DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYTHON3_PACKAGES_PATH}
-    )
-endif ()
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/mraa.py
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYTHON3_PACKAGES_PATH}
+)