diff --git a/CMakeLists.txt b/CMakeLists.txt
index b03050be4..e5db65239 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,11 @@ option(XACC_BUILD_SCIPY "Build Scipy optimizer plugin" OFF)
 option(XACC_BUILD_ANNEALING "Build annealing libraries" OFF)
 option(XACC_BUILD_GSL "Build GNU Scientific Library optimizer plugin" OFF)
 option(XACC_BUILD_IONTRAP "Build the iontrap plugin" OFF)
+option(XACC_BUILD_SCIKIT_QUANT "Build the Scikit-quant plugin" OFF)
+option(XACC_BUILD_ATOS "Build the Atos QLM plugin" OFF)
+option(XACC_BUILD_QFACTOR "Build the QFactor plugin" OFF)
+option(XACC_BUILD_QSEARCH "Build the QSearch plugin" OFF)
+option(XACC_BUILD_QRACK "Build the Qrack plugin" OFF)
 
 if(XACC_BUILD_ANNEALING)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DANNEALING_ENABLED")
diff --git a/python/plugins/CMakeLists.txt b/python/plugins/CMakeLists.txt
index 0d1f3115d..e5cd41ca5 100644
--- a/python/plugins/CMakeLists.txt
+++ b/python/plugins/CMakeLists.txt
@@ -15,7 +15,7 @@ set(LIBRARY_NAME xacc-py-plugin-loader)
 get_filename_component(PYTHON_LIB_NAME ${Python_LIBRARIES} NAME)
 configure_file(py_plugin_loader.in.cpp
                ${CMAKE_BINARY_DIR}/python/plugins/py_plugin_loader.cpp)
-message(STATUS " PYTHON: ${PYTHON_LIB_NAME}")
+message(STATUS "PYTHON: ${PYTHON_LIB_NAME}")
 file (GLOB SRC ${CMAKE_BINARY_DIR}/python/plugins/py_plugin_loader.cpp py_plugin_loader_activator.cpp)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
@@ -52,4 +52,6 @@ endif()
 install(TARGETS ${LIBRARY_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/plugins)
 
 add_subdirectory(mitiq)
-add_subdirectory(scikit-quant)
\ No newline at end of file
+if(XACC_BUILD_SCIKIT_QUANT)
+  add_subdirectory(scikit-quant)
+endif()
\ No newline at end of file
diff --git a/quantum/plugins/atos_qlm/CMakeLists.txt b/quantum/plugins/atos_qlm/CMakeLists.txt
index 8e9d9737a..9b3a56332 100644
--- a/quantum/plugins/atos_qlm/CMakeLists.txt
+++ b/quantum/plugins/atos_qlm/CMakeLists.txt
@@ -1 +1,3 @@
-add_subdirectory(accelerator)
\ No newline at end of file
+if(XACC_BUILD_ATOS)
+  add_subdirectory(accelerator)
+endif()
\ No newline at end of file
diff --git a/quantum/plugins/circuits/CMakeLists.txt b/quantum/plugins/circuits/CMakeLists.txt
index 032a7c72b..b674c625a 100644
--- a/quantum/plugins/circuits/CMakeLists.txt
+++ b/quantum/plugins/circuits/CMakeLists.txt
@@ -85,5 +85,10 @@ endif()
 
 install(TARGETS ${LIBRARY_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/plugins)
 
-add_subdirectory(py-qsearch)
-add_subdirectory(py-qfactor)
+if(XACC_BUILD_QSEARCH)
+  add_subdirectory(py-qsearch)
+endif()
+
+if(XACC_BUILD_QFACTOR)
+  add_subdirectory(py-qfactor)
+endif()
\ No newline at end of file