diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c0ef36b5be96b801425d8f902f4192b6a4d9056..8d8405eb99b0387c03ea187f47d423b720e2249e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -380,9 +380,8 @@ install(
 #--------------------------------------------------------------------------
 # Add Examples subdirectories
 #--------------------------------------------------------------------------
-if(BUILD_EXAMPLES)
-  add_subdirectory(Examples)
-endif()
+add_subdirectory(Examples)
+
 
 #--------------------------------------------------------------------------
 # Innerbuild dummy test
diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt
index 53892158ddc9fcf0b063c659f1fedb2e70c3e4b7..4002d359775dc4efa802a0feee060b86551b9e3a 100644
--- a/Examples/CMakeLists.txt
+++ b/Examples/CMakeLists.txt
@@ -37,25 +37,26 @@ list(APPEND FILE_LIST
 #-----------------------------------------------------------------------------
 # Add Example subdirectories
 #-----------------------------------------------------------------------------
-
-macro(listOfSubDir result curdir)
-  file(GLOB children RELATIVE ${curdir} ${curdir}/*)
-  set(dirlist "")
-  foreach(child ${children})
-    if(IS_DIRECTORY ${curdir}/${child})
-      list(APPEND dirlist ${child})
-    endif()
-  endforeach()
-  set(${result} ${dirlist})
-endmacro()
-
-listOfSubDir(subDirs ${CMAKE_CURRENT_SOURCE_DIR})
-
-foreach(subdir ${subDirs})
-  add_subdirectory(${subdir})
-endforeach()
+if(BUILD_EXAMPLES)
+    macro(listOfSubDir result curdir)
+      file(GLOB children RELATIVE ${curdir} ${curdir}/*)
+      set(dirlist "")
+      foreach(child ${children})
+        if(IS_DIRECTORY ${curdir}/${child})
+          list(APPEND dirlist ${child})
+        endif()
+      endforeach()
+      set(${result} ${dirlist})
+    endmacro()
+
+    listOfSubDir(subDirs ${CMAKE_CURRENT_SOURCE_DIR})
+
+    foreach(subdir ${subDirs})
+      add_subdirectory(${subdir})
+    endforeach()
+endif()
 
 #-----------------------------------------------------------------------------
 # Add external data
 #-----------------------------------------------------------------------------
-imstk_add_data(${PROJECT_NAME} ${FILE_LIST})
\ No newline at end of file
+imstk_add_data(${PROJECT_NAME} ${FILE_LIST})