Bugfixes

tjof2 · May 19, 2020 · c213de3 · c213de3
1 parent 9088df5
commit c213de3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,8 +4,9 @@ project (PGURE-SVT)
 set (PGURE-SVT_VERSION_MAJOR 0)
 set (PGURE-SVT_VERSION_MINOR 4)
 set (PGURE-SVT_VERSION_PATCH 3)
+set (PGURE-SVT_VERSION_FULL "${PGURE-SVT_VERSION_MAJOR}.${PGURE-SVT_VERSION_MINOR}.${PGURE-SVT_VERSION_PATCH}")
 
-message(STATUS "Configuring PGURE-SVT ${PGURE-SVT_VERSION_MAJOR}.${PGURE-SVT_VERSION_MINOR}.${PGURE-SVT_VERSION_PATCH}")
+message(STATUS "Configuring PGURE-SVT ${PGURE-SVT_VERSION_FULL}")
 
 set(OS unix)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_aux/Modules/")
@@ -125,13 +126,6 @@ if((BUILD_PYTHON OR BUILD_PYTHON_DIST) AND PYTHON)
     file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE
          DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
-    # file(GLOB SVT_SRC_C "${CMAKE_CURRENT_SOURCE_DIR}/src/*.c*")
-    # file(GLOB SVT_SRC_H "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h*")
-    # file(COPY ${SVT_SRC_C} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/src)
-    # file(COPY ${SVT_SRC_H} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/src)
-    # file(GLOB SVT_CMAKE "${CMAKE_CURRENT_SOURCE_DIR}/cmake_aux/Modules/*.cmake")
-    # file(COPY ${SVT_CMAKE} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/cmake_aux/Modules)
-
     add_custom_command(OUTPUT ${OUTPUT}
                        COMMAND ${PYTHON} ${SETUP_PY} build
                        COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
@@ -145,6 +139,9 @@ if((BUILD_PYTHON OR BUILD_PYTHON_DIST) AND PYTHON)
 
     if(BUILD_PYTHON_DIST)
         install(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} sdist bdist_wheel)")
+
+        #set(PYTHON_WHEEL "${CMAKE_CURRENT_BINARY_DIR}/dist/pguresvt-${PGURE-SVT_VERSION_FULL}-py3-none-any.whl")
+        #install(CODE "execute_process(COMMAND auditwheel repair ${PYTHON_WHEEL})")
     endif()
 
 endif()
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1 @@
 include LICENSE
-#recursive-include src *.c *.h *.cpp *.hpp
-#recursive-include cmake_aux/Modules *.cmake
diff --git a/pguresvt/__init__.py.in b/pguresvt/__init__.py.in
@@ -21,4 +21,4 @@ from .pguresvt import SVT
 
 
 __all__ = ["SVT"]
-__version__ = "${PGURE-SVT_VERSION_MAJOR}.${PGURE-SVT_VERSION_MINOR}.${PGURE-SVT_VERSION_PATCH}"
+__version__ = "${PGURE-SVT_VERSION_FULL}"
diff --git a/setup.py.in b/setup.py.in
@@ -27,7 +27,7 @@ def read(fname):
 
 setup(
     name="pguresvt",
-    version="${PGURE-SVT_VERSION_MAJOR}.${PGURE-SVT_VERSION_MINOR}.${PGURE-SVT_VERSION_PATCH}",
+    version="${PGURE-SVT_VERSION_FULL}",
     author="Tom Furnival",
     author_email="[email protected]",
     url="https://github.com/tjof2/pgure-svt",
@@ -52,5 +52,5 @@ setup(
     package_data={"": ["LICENSE", "README.md"]},
     python_requires=">=3.6",
     install_requires=["numpy"],
-    setup_requires=["wheel"],
+    setup_requires=["wheel", "auditwheel"],
 )