From ad825e4096df7431d4e81cfec9bf4b85ebe30bdd Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Thu, 22 Mar 2018 15:42:01 +0100 Subject: [PATCH] CMake: fix wheel platlib/purelib missmatch (Fix #618) --- cmake/python.cmake | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/cmake/python.cmake b/cmake/python.cmake index e9cdd12591..2f03251688 100644 --- a/cmake/python.cmake +++ b/cmake/python.cmake @@ -89,31 +89,38 @@ add_custom_command(OUTPUT setup.py dist ${PROJECT_NAME}.egg-info COMMAND ${CMAKE_COMMAND} -E echo " def has_ext_modules(self):" >> setup.py COMMAND ${CMAKE_COMMAND} -E echo " return True" >> setup.py COMMAND ${CMAKE_COMMAND} -E echo "" >> setup.py + COMMAND ${CMAKE_COMMAND} -E echo "from setuptools.command.install import install" >> setup.py + COMMAND ${CMAKE_COMMAND} -E echo "class InstallPlatlib(install):" >> setup.py + COMMAND ${CMAKE_COMMAND} -E echo " def finalize_options(self):" >> setup.py + COMMAND ${CMAKE_COMMAND} -E echo " install.finalize_options(self)" >> setup.py + COMMAND ${CMAKE_COMMAND} -E echo " self.install_lib=self.install_platlib" >> setup.py + COMMAND ${CMAKE_COMMAND} -E echo "" >> setup.py COMMAND ${CMAKE_COMMAND} -E echo "setup(" >> setup.py COMMAND ${CMAKE_COMMAND} -E echo " name='ortools'," >> setup.py COMMAND ${CMAKE_COMMAND} -E echo " license='Apache 2.0'," >> setup.py COMMAND ${CMAKE_COMMAND} -E echo " version='${PROJECT_VERSION}'," >> setup.py COMMAND ${CMAKE_COMMAND} -E echo " author='Google Inc'," >> setup.py - COMMAND ${CMAKE_COMMAND} -E echo " author_email = 'lperron@google.com'," >> setup.py - COMMAND ${CMAKE_COMMAND} -E echo " description = 'Google OR-Tools python libraries and modules'," >> setup.py - COMMAND ${CMAKE_COMMAND} -E echo " long_description = 'read(README.txt)'," >> setup.py - COMMAND ${CMAKE_COMMAND} -E echo " keywords = ('operations research' +" >> setup.py + COMMAND ${CMAKE_COMMAND} -E echo " author_email='lperron@google.com'," >> setup.py + COMMAND ${CMAKE_COMMAND} -E echo " description='Google OR-Tools python libraries and modules'," >> setup.py + COMMAND ${CMAKE_COMMAND} -E echo " long_description='read(README.txt)'," >> setup.py + COMMAND ${CMAKE_COMMAND} -E echo " keywords=('operations research' +" >> setup.py COMMAND ${CMAKE_COMMAND} -E echo " ', constraint programming' +" >> setup.py COMMAND ${CMAKE_COMMAND} -E echo " ', linear programming' +" >> setup.py COMMAND ${CMAKE_COMMAND} -E echo " ', flow algoritms' +" >> setup.py COMMAND ${CMAKE_COMMAND} -E echo " ', python')," >> setup.py - COMMAND ${CMAKE_COMMAND} -E echo " url = 'https://developers.google.com/optimization/'," >> setup.py - COMMAND ${CMAKE_COMMAND} -E echo " download_url = 'https://github.com/google/or-tools/releases'," >> setup.py + COMMAND ${CMAKE_COMMAND} -E echo " url='https://developers.google.com/optimization/'," >> setup.py + COMMAND ${CMAKE_COMMAND} -E echo " download_url='https://github.com/google/or-tools/releases'," >> setup.py COMMAND ${CMAKE_COMMAND} -E echo " distclass=BinaryDistribution," >> setup.py + COMMAND ${CMAKE_COMMAND} -E echo " cmdclass={'install': InstallPlatlib}," >> setup.py COMMAND ${CMAKE_COMMAND} -E echo " packages=find_packages()," >> setup.py COMMAND ${CMAKE_COMMAND} -E echo " package_data={" >> setup.py - COMMAND ${CMAKE_COMMAND} -E echo " 'ortools':[$<$>:'../$'>]," >> setup.py - COMMAND ${CMAKE_COMMAND} -E echo " 'ortools.constraint_solver':['$']," >> setup.py - COMMAND ${CMAKE_COMMAND} -E echo " 'ortools.linear_solver':['$']," >> setup.py - COMMAND ${CMAKE_COMMAND} -E echo " 'ortools.sat':['$']," >> setup.py - COMMAND ${CMAKE_COMMAND} -E echo " 'ortools.graph':['$']," >> setup.py - COMMAND ${CMAKE_COMMAND} -E echo " 'ortools.algorithms':['$']," >> setup.py - COMMAND ${CMAKE_COMMAND} -E echo " 'ortools.data':['$']," >> setup.py + COMMAND ${CMAKE_COMMAND} -E echo " 'ortools':[$<$>:'../$'>]," >> setup.py + COMMAND ${CMAKE_COMMAND} -E echo " 'ortools.constraint_solver':['$']," >> setup.py + COMMAND ${CMAKE_COMMAND} -E echo " 'ortools.linear_solver':['$']," >> setup.py + COMMAND ${CMAKE_COMMAND} -E echo " 'ortools.sat':['$']," >> setup.py + COMMAND ${CMAKE_COMMAND} -E echo " 'ortools.graph':['$']," >> setup.py + COMMAND ${CMAKE_COMMAND} -E echo " 'ortools.algorithms':['$']," >> setup.py + COMMAND ${CMAKE_COMMAND} -E echo " 'ortools.data':['$']," >> setup.py COMMAND ${CMAKE_COMMAND} -E echo " }," >> setup.py COMMAND ${CMAKE_COMMAND} -E echo " include_package_data=True," >> setup.py COMMAND ${CMAKE_COMMAND} -E echo " install_requires=[" >> setup.py