Commit b3507d95 authored by Mccaskey, Alex's avatar Mccaskey, Alex
Browse files

Fixing a few bugs with setup.py on linux


Signed-off-by: Mccaskey, Alex's avatarAlex McCaskey <mccaskeyaj@ornl.gov>
parent 7c557f69
...@@ -41,7 +41,6 @@ class InstallCommand(InstallCommandBase): ...@@ -41,7 +41,6 @@ class InstallCommand(InstallCommandBase):
InstallCommandBase.finalize_options(self) InstallCommandBase.finalize_options(self)
def run(self): def run(self):
global install_directory
InstallCommandBase.run(self) InstallCommandBase.run(self)
self.do_egg_install() self.do_egg_install()
subdirs = [name for name in os.listdir(self.install_lib) subdirs = [name for name in os.listdir(self.install_lib)
...@@ -89,9 +88,6 @@ class CMakeBuild(build_ext): ...@@ -89,9 +88,6 @@ class CMakeBuild(build_ext):
cmake_args += ['-DCMAKE_BUILD_TYPE=' + cfg] cmake_args += ['-DCMAKE_BUILD_TYPE=' + cfg]
build_args += ['--', '-j'+str(multiprocessing.cpu_count())] build_args += ['--', '-j'+str(multiprocessing.cpu_count())]
env['CXXFLAGS'] = '{} -DVERSION_INFO=\\"{}\\"'.format(
env.get('CXXFLAGS', ''),
self.distribution.get_version())
if not os.path.exists(self.build_temp): if not os.path.exists(self.build_temp):
os.makedirs(self.build_temp) os.makedirs(self.build_temp)
subprocess.check_call(['cmake', ext.sourcedir] + cmake_args, subprocess.check_call(['cmake', ext.sourcedir] + cmake_args,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment