take PCH build out of the wheel build

wlav · Nov 11, 2023 · 3e8db58 · 3e8db58
1 parent 0aefc26
commit 3e8db58
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 27 deletions.
diff --git a/cling/setup.py b/cling/setup.py
@@ -251,9 +251,6 @@ def run(self):
             raise DistutilsSetupError('Failed to install cppyy-cling')
         if env_make: os.putenv("MAKE", env_make)
 
-     # remove allDict.cxx.pch as it's not portable (rebuild on first run, see cppyy)
-        log.info('removing allDict.cxx.pch')
-        os.remove(os.path.join(get_prefix(), 'etc', 'allDict.cxx.pch'))
      # for manylinux, reset the default cxxversion to 20 if no user override
         if not 'STDCXX' in os.environ and is_manylinux():
             log.info('updating root-config to C++20 for manylinux')

diff --git a/cling/src/CMakeLists.txt b/cling/src/CMakeLists.txt
@@ -361,14 +361,6 @@ if(runtime_cxxmodules)
 else()
   get_property(incdirs DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
 
-  if(WIN32)
-    list(APPEND incdirs
-      ${CMAKE_SOURCE_DIR}/graf2d/win32gdk/gdk/src
-      ${CMAKE_SOURCE_DIR}/graf2d/win32gdk/gdk/src/gdk
-      ${CMAKE_SOURCE_DIR}/graf2d/win32gdk/gdk/src/glib
-    )
-  endif()
-
   foreach(d ${incdirs})
     if(NOT "${d}" MATCHES "AFTER|BEFORE|INTERFACE|PRIVATE|PUBLIC|SYSTEM")
       set(__allIncludes ${__allIncludes} -I${d})
@@ -396,9 +388,9 @@ else()
       ${CMAKE_SOURCE_DIR}/build/unix/makepchinput.py
       ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py
   )
-  add_custom_target(onepcm ALL DEPENDS etc/allDict.cxx.pch)
-  install(FILES ${CMAKE_BINARY_DIR}/etc/allDict.cxx.pch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
-  install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/dictpch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+  #add_custom_target(onepcm ALL DEPENDS etc/allDict.cxx.pch)
+  #install(FILES ${CMAKE_BINARY_DIR}/etc/allDict.cxx.pch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+  #install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/dictpch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
 endif()
 
 # FIXME: move installation of PCMS in ROOT_GENERATE_DICTIONARY().

diff --git a/cling/src/build/unix/makepchinput.py b/cling/src/build/unix/makepchinput.py
@@ -280,19 +280,6 @@ def isDirForPCH(dirName, expPyROOT):
    PCHPatternsWhitelist = ["interpreter/",
                            "core/",
                            "io/io",
-                           "net/net",
-                           "math/",
-                           "hist/",
-                           "tree/",
-                           "graf2d",
-                           "graf3d/ftgl",
-                           "graf3d/g3d",
-                           "graf3d/gl",
-                           "gui/gui",
-                           "gui/fitpanel",
-                           "rootx",
-                           "roofit/",
-                           "tmva",
                            "main"]
    if expPyROOT:
       PCHPatternsWhitelist.append("bindings/tpython")