@@ -88,13 +88,20 @@ def run(self):
8888 "-Dbuiltin_lz4=ON -Dbuiltin_lzma=ON -Dbuiltin_zstd=ON -Dbuiltin_xxhash=ON " # builtins
8989 "-Dpyroot=ON -Ddataframe=ON -Dxrootd=ON -Dssl=ON -Dimt=ON "
9090 "-Droofit=ON -Dmathmore=ON -Dbuiltin_fftw3=ON -Dbuiltin_gsl=ON "
91- # Next 4 paths represent the structure of the target binaries/headers/libs
91+ f"-DCMAKE_INSTALL_PREFIX={ INSTALL_DIR } -B { BUILD_DIR } -S { SOURCE_DIR } "
92+ # Next paths represent the structure of the target binaries/headers/libs
9293 # as the target installation directory of the Python environment would expect
9394 f"-DCMAKE_INSTALL_BINDIR={ ROOT_BUILD_INTERNAL_DIRNAME } /ROOT/bin "
95+ f"-DCMAKE_INSTALL_CMAKEDIR={ ROOT_BUILD_INTERNAL_DIRNAME } /cmake "
96+ f"-DCMAKE_INSTALL_FONTDIR={ ROOT_BUILD_INTERNAL_DIRNAME } /ROOT/fonts "
97+ f"-DCMAKE_INSTALL_ICONDIR={ ROOT_BUILD_INTERNAL_DIRNAME } /ROOT/icons "
9498 f"-DCMAKE_INSTALL_INCLUDEDIR={ ROOT_BUILD_INTERNAL_DIRNAME } /ROOT/include "
9599 f"-DCMAKE_INSTALL_LIBDIR={ ROOT_BUILD_INTERNAL_DIRNAME } /ROOT/lib "
100+ f"-DCMAKE_INSTALL_MACRODIR={ ROOT_BUILD_INTERNAL_DIRNAME } /ROOT/macros "
101+ f"-DCMAKE_INSTALL_MANDIR={ ROOT_BUILD_INTERNAL_DIRNAME } /ROOT/man "
96102 f"-DCMAKE_INSTALL_PYTHONDIR={ ROOT_BUILD_INTERNAL_DIRNAME } "
97- f"-DCMAKE_INSTALL_PREFIX={ INSTALL_DIR } -B { BUILD_DIR } -S { SOURCE_DIR } "
103+ f"-DCMAKE_INSTALL_SYSCONFDIR={ ROOT_BUILD_INTERNAL_DIRNAME } /ROOT/etc "
104+ f"-DCMAKE_INSTALL_TUTDIR={ ROOT_BUILD_INTERNAL_DIRNAME } /tutorials "
98105 )
99106 subprocess .run (configure_command , check = True )
100107
@@ -136,15 +143,8 @@ def run(self):
136143 root_package_dir = os .path .join (install_path , "ROOT" )
137144
138145 # After the copy of the "mock" package structure from the ROOT installations, these are the
139- # leftover directories that still need to be copied
140- self .copy_tree (os .path .join (INSTALL_DIR , "cmake" ), os .path .join (root_package_dir , "cmake" ))
141- self .copy_tree (os .path .join (INSTALL_DIR , "etc" ), os .path .join (root_package_dir , "etc" ))
142- self .copy_tree (os .path .join (INSTALL_DIR , "fonts" ), os .path .join (root_package_dir , "fonts" ))
143- self .copy_tree (os .path .join (INSTALL_DIR , "icons" ), os .path .join (root_package_dir , "icons" ))
144- self .copy_tree (os .path .join (INSTALL_DIR , "macros" ), os .path .join (root_package_dir , "macros" ))
145- self .copy_tree (os .path .join (INSTALL_DIR , "man" ), os .path .join (root_package_dir , "man" ))
146+ # leftover files that still need to be copied
146147 self .copy_tree (os .path .join (INSTALL_DIR , "README" ), os .path .join (root_package_dir , "README" ))
147- self .copy_tree (os .path .join (INSTALL_DIR , "tutorials" ), os .path .join (root_package_dir , "tutorials" ))
148148 self .copy_file (os .path .join (INSTALL_DIR , "LICENSE" ), os .path .join (root_package_dir , "LICENSE" ))
149149
150150 def get_outputs (self ):
0 commit comments