Index: openmp/libompd/CMakeLists.txt
===================================================================
--- openmp/libompd/CMakeLists.txt
+++ openmp/libompd/CMakeLists.txt
@@ -8,10 +8,13 @@
 #//===----------------------------------------------------------------------===//
 #
 
+find_package (Python3 COMPONENTS Interpreter Development)
+option(LIBOMP_OMPD_GDB_SUPPORT "Build gdb-plugin code that enables OMPD support in GDB." ${Python3_FOUND})
+
 if(LIBOMP_OMPD_SUPPORT)
     set(OMPD_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/src/)
     add_subdirectory(src)
-    if(NOT DISABLE_OMPD_GDB_PLUGIN)
+    if(LIBOMP_OMPD_GDB_SUPPORT)
         add_subdirectory(gdb-plugin)
     endif()
 endif()
Index: openmp/libompd/gdb-plugin/CMakeLists.txt
===================================================================
--- openmp/libompd/gdb-plugin/CMakeLists.txt
+++ openmp/libompd/gdb-plugin/CMakeLists.txt
@@ -13,9 +13,6 @@
     ${CMAKE_MODULE_PATH}
 )
 
-find_package (Python3 COMPONENTS Interpreter Development)
-find_package (PythonLibs REQUIRED)
-
 include_directories (${OMPD_INCLUDE_PATH})
 include_directories (${LIBOMP_INCLUDE_DIR})
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/python-module/ompd/__init__.py