Cleanup: rename WITH_X11 to WITH_GHOST_X11
authorCampbell Barton <ideasman42@gmail.com>
Fri, 1 May 2020 09:14:50 +0000 (19:14 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 1 May 2020 09:14:50 +0000 (19:14 +1000)
Matches WITH_GHOST_{SDL|WAYLAND}

CMakeLists.txt
build_files/cmake/platform/platform_unix.cmake
extern/CMakeLists.txt
intern/ghost/CMakeLists.txt
intern/ghost/intern/GHOST_ISystem.cpp
intern/ghost/intern/GHOST_IXrGraphicsBinding.h
intern/ghost/intern/GHOST_XrGraphicsBinding.cpp
intern/ghost/intern/GHOST_Xr_openxr_includes.h
intern/ghost/test/CMakeLists.txt
source/blender/windowmanager/CMakeLists.txt

index 1201ddda33341ea18b808b78ba879e7aa0212a6d..f4ccd8483caee008c48443e0ea54474ebed1f5b0 100644 (file)
@@ -140,7 +140,7 @@ get_blender_version()
 
 # First platform specific non-cached vars
 if(UNIX AND NOT (APPLE OR HAIKU))
-  set(WITH_X11 ON)
+  set(WITH_GHOST_X11 ON)
 endif()
 
 # Blender internal features
@@ -211,7 +211,7 @@ if(UNIX AND NOT APPLE)
   option(WITH_GHOST_WAYLAND   "Enable building Blender against Wayland for windowing" OFF)
 endif()
 
-if(WITH_X11)
+if(WITH_GHOST_X11)
   option(WITH_GHOST_XDND    "Enable drag'n'drop support on X11 using XDND protocol" ON)
 endif()
 
@@ -236,7 +236,7 @@ if(UNIX AND NOT APPLE)
   mark_as_advanced(WITH_OPENMP_STATIC)
 endif()
 
-if(WITH_X11)
+if(WITH_GHOST_X11)
   option(WITH_X11_XINPUT    "Enable X11 Xinput (tablet support and unicode input)"  ON)
   option(WITH_X11_XF86VMODE "Enable X11 video mode switching"                       ON)
   option(WITH_X11_XFIXES    "Enable X11 XWayland cursor warping workaround"         ON)
@@ -693,7 +693,7 @@ if(WITH_INSTALL_PORTABLE)
 endif()
 
 if(WITH_GHOST_SDL OR WITH_HEADLESS)
-  set(WITH_X11           OFF)
+  set(WITH_GHOST_X11     OFF)
   set(WITH_X11_XINPUT    OFF)
   set(WITH_X11_XF86VMODE OFF)
   set(WITH_X11_XFIXES    OFF)
index 0bd33b93dcfde5c222423f2591baf0535dcaf3f5..3cfe8309bf106d1a609eb5c7cb12d852e13179b1 100644 (file)
@@ -524,7 +524,7 @@ if(WITH_GHOST_WAYLAND)
   endif()
 endif()
 
-if(WITH_X11)
+if(WITH_GHOST_X11)
   find_package(X11 REQUIRED)
 
   find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
index e79aba0e9889109b3087506153a54bb1eea57a93..235c2fa931ace7c27a69eeb14b51bf5565271d99 100644 (file)
@@ -72,7 +72,7 @@ if(WITH_CYCLES OR WITH_COMPOSITOR OR WITH_OPENSUBDIV)
   endif()
 endif()
 
-if(WITH_X11 AND WITH_GHOST_XDND)
+if(WITH_GHOST_X11 AND WITH_GHOST_XDND)
   add_subdirectory(xdnd)
 endif()
 
index 3ba6c5d48c75c5d04e0d722bdd90a3b7f15ec985..7620bd4363026be6d2ee8e22078bddf707bc48bc 100644 (file)
@@ -149,7 +149,7 @@ if(WITH_HEADLESS OR WITH_GHOST_SDL)
     endif()
   endif()
 
-elseif(APPLE AND NOT WITH_X11)
+elseif(APPLE AND NOT WITH_GHOST_X11)
   list(APPEND SRC
     intern/GHOST_DisplayManagerCocoa.mm
     intern/GHOST_SystemCocoa.mm
@@ -177,8 +177,8 @@ elseif(APPLE AND NOT WITH_X11)
     )
   endif()
 
-elseif(WITH_X11 OR WITH_GHOST_WAYLAND)
-  if(WITH_X11)
+elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
+  if(WITH_GHOST_X11)
     list(APPEND INC_SYS
       ${X11_X11_INCLUDE_PATH}
     )
@@ -254,7 +254,7 @@ elseif(WITH_X11 OR WITH_GHOST_WAYLAND)
       )
     endif()
 
-    add_definitions(-DWITH_X11)
+    add_definitions(-DWITH_GHOST_X11)
   endif()
 
   if(WITH_GHOST_WAYLAND)
@@ -335,7 +335,7 @@ elseif(WITH_X11 OR WITH_GHOST_WAYLAND)
     )
   endif()
 
-  add_definitions(-DWITH_X11)
+  add_definitions(-DWITH_GHOST_X11)
 
 elseif(WIN32)
   # # Warnings as errors, this is too strict!
index 8041f7758d8f213c83ce07eb7e3f56430f05e8db..11d1c501d04be334d578b7f4a096a890641d863f 100644 (file)
@@ -27,8 +27,8 @@
 
 #include "GHOST_ISystem.h"
 
-#if defined(WITH_X11) || defined(WITH_GHOST_WAYLAND)
-#  ifdef WITH_X11
+#if defined(WITH_GHOST_X11) || defined(WITH_GHOST_WAYLAND)
+#  ifdef WITH_GHOST_X11
 #    include "GHOST_SystemX11.h"
 #  endif
 #  ifdef WITH_GHOST_WAYLAND
@@ -54,7 +54,7 @@ GHOST_TSuccess GHOST_ISystem::createSystem()
 {
   GHOST_TSuccess success;
   if (!m_system) {
-#if defined(WITH_X11) || defined(WITH_GHOST_WAYLAND)
+#if defined(WITH_GHOST_X11) || defined(WITH_GHOST_WAYLAND)
 #  ifdef WITH_GHOST_WAYLAND
     try {
       m_system = new GHOST_SystemWayland();
@@ -62,7 +62,7 @@ GHOST_TSuccess GHOST_ISystem::createSystem()
     catch (const std::exception &) {
     }
 #  endif
-#  ifdef WITH_X11
+#  ifdef WITH_GHOST_X11
     if (!m_system) {
       m_system = new GHOST_SystemX11();
     }
index cddb557d1636b5b89b11e039d600a8b7e3ba0110..5794a68202355888ae35772e6a3852ab97d59a46 100644 (file)
@@ -33,7 +33,7 @@ class GHOST_IXrGraphicsBinding {
 
  public:
   union {
-#if defined(WITH_X11)
+#if defined(WITH_GHOST_X11)
     XrGraphicsBindingOpenGLXlibKHR glx;
 #elif defined(WIN32)
     XrGraphicsBindingOpenGLWin32KHR wgl;
index 60b3b06f6a8f32d12f2c52f1719531ae257ab1ae..5e30502f7ff2571b5852b1559e4840624348d275 100644 (file)
@@ -22,7 +22,7 @@
 #include <list>
 #include <sstream>
 
-#if defined(WITH_X11)
+#if defined(WITH_GHOST_X11)
 #  include "GHOST_ContextGLX.h"
 #elif defined(WIN32)
 #  include "GHOST_ContextD3D.h"
@@ -68,7 +68,7 @@ class GHOST_XrGraphicsBindingOpenGL : public GHOST_IXrGraphicsBinding {
                                 XrSystemId system_id,
                                 std::string *r_requirement_info) const override
   {
-#if defined(WITH_X11)
+#if defined(WITH_GHOST_X11)
     GHOST_ContextGLX *ctx_gl = static_cast<GHOST_ContextGLX *>(ghost_ctx);
 #else
     GHOST_ContextWGL *ctx_gl = static_cast<GHOST_ContextWGL *>(ghost_ctx);
@@ -107,7 +107,7 @@ class GHOST_XrGraphicsBindingOpenGL : public GHOST_IXrGraphicsBinding {
 
   void initFromGhostContext(GHOST_Context *ghost_ctx) override
   {
-#if defined(WITH_X11)
+#if defined(WITH_GHOST_X11)
     GHOST_ContextGLX *ctx_glx = static_cast<GHOST_ContextGLX *>(ghost_ctx);
     XVisualInfo *visual_info = glXGetVisualFromFBConfig(ctx_glx->m_display, ctx_glx->m_fbconfig);
 
index 925d6037750b0144d706e56061a1266e488ffb95..9cac43b154925546033bc645ff17b6bfdd7d09c5 100644 (file)
@@ -42,7 +42,7 @@
 #ifdef XR_USE_GRAPHICS_API_D3D12
 #  include <d3d12.h>
 #endif
-#ifdef WITH_X11
+#ifdef WITH_GHOST_X11
 #  include <GL/glxew.h>
 #endif
 
index eda41eb9c1a023c9e6f12e851b96437d97d2022a..b6e3c0ecf5f229db869b00c137349e6cd640a5e3 100644 (file)
@@ -85,8 +85,9 @@ endif()
 # Libraries
 
 if(UNIX AND NOT APPLE)
-  set(WITH_X11 ON)
+  set(WITH_GHOST_X11 ON)
 endif()
+
 # for now... default to this
 add_definitions(-DWITH_GL_PROFILE_COMPAT)
 # BLF needs this to ignore GPU library
index 90ff7bb8f85727aad935a4209babd81114e526cd..22fd55cd49afda943c8e979a98fd6a82aa15a825 100644 (file)
@@ -153,8 +153,8 @@ endif()
 
 if(WITH_HEADLESS)
   add_definitions(-DWITH_HEADLESS)
-elseif(WITH_X11)
-  add_definitions(-DWITH_X11)
+elseif(WITH_GHOST_X11)
+  add_definitions(-DWITH_GHOST_X11)
 endif()
 
 if(WITH_PYTHON)