Merge pull request #511 from isuruf/cmake

Fix for platforms where purelib!=platlib

Author: isuruf

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 2.8.12...4.0.0)
 
 if (POLICY CMP0057)
   cmake_policy(SET CMP0057 NEW) # needed for llvm >= 16

cmake/FindPython.cmake

@@ -60,7 +60,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 endif()
 
 execute_process(
-    COMMAND ${PYTHON_BIN} -c "from sysconfig import get_paths; print(get_paths()['purelib'])"
+    COMMAND ${PYTHON_BIN} -c "from sysconfig import get_paths; print(get_paths()['platlib'])"
     OUTPUT_VARIABLE PYTHON_INSTALL_PATH_tmp
 )
 string(STRIP ${PYTHON_INSTALL_PATH_tmp} PYTHON_INSTALL_PATH_tmp)

setup.py

@@ -117,7 +117,7 @@ def cmake_build(self):
 
         cmake_cmd = ["cmake", source_dir,
             "-DCMAKE_BUILD_TYPE=" + cmake_build_type[0],
-            "-DSYMENGINE_INSTALL_PY_FILES=OFF",
+            "-DSYMENGINE_INSTALL_PY_FILES=ON",
         ]
         cmake_cmd.extend(process_opts(cmake_opts))
         if not path.exists(path.join(build_dir, "CMakeCache.txt")):
@@ -232,7 +232,7 @@ def finalize_options(self):
       url="https://github.com/symengine/symengine.py",
       python_requires='>=3.9,<4',
       zip_safe=False,
-      packages=['symengine', 'symengine.lib', 'symengine.tests'],
+      packages=[],
       cmdclass = cmdclass,
       classifiers=[
         'License :: OSI Approved :: MIT License',

symengine/CMakeLists.txt

@@ -1,10 +1,17 @@
 add_subdirectory(lib)
 
 if (SYMENGINE_INSTALL_PY_FILES)
-    add_subdirectory(tests)
-
-    set(PY_PATH ${PYTHON_INSTALL_PATH}/symengine)
-    install(FILES __init__.py utilities.py sympy_compat.py functions.py printing.py
-       DESTINATION ${PY_PATH}
-    )
+  add_subdirectory(tests)
+  set(PY_PATH ${PYTHON_INSTALL_PATH}/symengine)
+  install(
+    FILES
+      __init__.py
+      functions.py
+      printing.py
+      sympy_compat.py
+      test_utilities.py
+      utilities.py
+    DESTINATION
+      ${PY_PATH}
+)
 endif ()

symengine/tests/CMakeLists.txt

@@ -1,13 +1,19 @@
 set(PY_PATH ${PYTHON_INSTALL_PATH}/symengine/tests)
-install(FILES __init__.py
+install(
+  FILES
+    __init__.py
     test_arit.py
+    test_cse.py
     test_dict_basic.py
     test_eval.py
     test_expr.py
     test_functions.py
-    test_number.py
+    test_lambdify.py
+    test_logic.py
     test_matrices.py
     test_ntheory.py
+    test_number.py
+    test_pickling.py
     test_printing.py
     test_sage.py
     test_series_expansion.py
@@ -16,10 +22,9 @@ install(FILES __init__.py
     test_subs.py
     test_symbol.py
     test_sympify.py
+    test_sympy_compat.py
     test_sympy_conv.py
     test_var.py
-    test_lambdify.py
-    test_sympy_compat.py
-    test_logic.py
-    DESTINATION ${PY_PATH}
-    )
+  DESTINATION
+    ${PY_PATH}
+)

symengine_version.txt

@@ -1 +1 @@
-v0.14.0
+153b7e98f310bccaae586dab6b49284ccd5f4174