diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ea1395..5c5c28d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,23 +138,28 @@ if(BUILD_TESTING)
   mark_as_advanced(BUILDNAME)
 endif()
 
-# Look for closedbr automatically
+# Look for extensions to OpenBR
 set(BR_THIRDPARTY_PLUGINS_DIR CACHE PATH "")
 set(BR_THIRDPARTY_APPS_DIR CACHE PATH "")
 mark_as_advanced(BR_THIRDPARTY_PLUGINS_DIR)
 mark_as_advanced(BR_THIRDPARTY_APPS_DIR)
 
-if(EXISTS "$ENV{CLOSEDBR}" AND IS_DIRECTORY "$ENV{CLOSEDBR}")
-  set(CLOSEDBR_DIR $ENV{CLOSEDBR})
+if(BR_THIRDPARTY_DIR)
+  if(EXISTS "${BR_THIRDPARTY_DIR}/test/tests.cmake")
+    include("${BR_THIRDPARTY_DIR}/test/tests.cmake")
+  endif()
+  if(EXISTS "${BR_THIRDPARTY_DIR}/plugins")
+    set(BR_THIRDPARTY_PLUGINS_DIR ${BR_THIRDPARTY_PLUGINS_DIR} "${BR_THIRDPARTY_DIR}/plugins")
+  endif()
+  if(EXISTS "${BR_THIRDPARTY_DIR}/app")
+    set(BR_THIRDPARTY_APPS_DIR    ${BR_THIRDPARTY_APPS_DIR}    "${BR_THIRDPARTY_DIR}/app")
+  endif()
+  if (EXISTS "${BR_THIRDPARTY_DIR}/share")
+    install(DIRECTORY ${BR_THIRDPARTY_DIR}/share DESTINATION .)
+  endif()
 else()
-  set(CLOSEDBR_DIR "${CMAKE_SOURCE_DIR}/../closedbr")
-endif()
-if(EXISTS "${CLOSEDBR_DIR}" AND IS_DIRECTORY "${CLOSEDBR_DIR}")
-  set(CLOSEDBR_DIR "${CLOSEDBR_DIR}" CACHE PATH "Path to ClosedBR")
-  include("${CLOSEDBR_DIR}/test/closedtests.cmake")
-  set(BR_THIRDPARTY_PLUGINS_DIR ${BR_THIRDPARTY_PLUGINS_DIR} "${CLOSEDBR_DIR}/plugins")
-  set(BR_THIRDPARTY_APPS_DIR    ${BR_THIRDPARTY_APPS_DIR}    "${CLOSEDBR_DIR}/app")
-  install(DIRECTORY ${CLOSEDBR_DIR}/share DESTINATION .)
+  set(BR_THIRDPARTY_DIR "" CACHE PATH "Path to proprietary software")
+  mark_as_advanced(BR_THIRDPARTY_DIR)
 endif()
 
 # Build the SDK