Compile all versions

.github/workflows/build_variants.yml

@@ -6,62 +6,62 @@ on:
     branches: [ simon ]
 
 jobs:
-#  create-Linux:
-#    runs-on: ubuntu-latest
-#
-#    steps:
-#    - uses: actions/checkout@v2
-#
-#    - name: Build manylinux wheels
-#      run:  docker run -e PLAT=manylinux2010_x86_64 -v `pwd`:/io quay.io/pypa/manylinux2010_x86_64 /io/Scripts/buildscript.sh
-#
-#    - uses: actions/upload-artifact@v2
-#      with:
-#        name: CrysFML - Linux
-#        path: ${{ github.workspace }}/dist/*.whl
-#
-#  create-OSX:
-#    strategy:
-#      max-parallel: 4
-#      matrix:
-#        python-version: ['3.6', '3.7', '3.8', '3.9']
-#        os: [macos-10.15]
-#        gcc_v: [ 10 ] # Version of GFortran we want to use.
-##        exclude: # Currently only python > 3.8 is supported on macos-11.0 and > 3.6 on macos-10.15
-##          - os: macos-11.0
-##            python-version: '3.7'
-##          - os: macos-11.0
-##            python-version: '3.8'
-#
-#    runs-on: ${{ matrix.os }}
-#
-#    steps:
-#    - uses: actions/checkout@v2
-#
-#    - name: Setup python
-#      uses: actions/setup-python@v1
-#      with:
-#        python-version: ${{matrix.python-version}}
-#
-#    - name: Install cmake
-#      run: pip3 install cmake delocate wheel
-#
-#    - name: Build CFML (OSX)
-#      env:
-#        FC: gfortran-${{ matrix.gcc_v }}
-#        CC: gcc-${{ matrix.gcc_v }}
-#      run: |
-#        pip3 wheel ./ --no-deps -w ./dist/
-#        delocate-wheel -w fixed_wheels -v ./dist/*.whl
-#
-#    - uses: actions/upload-artifact@v2
-#      with:
-#        name: CrysFML - ${{ matrix.os }} - Python ${{ matrix.python-version }}
-#        path: ./fixed_wheels/*.whl
+  create-Linux:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Build manylinux wheels
+      run:  docker run -e PLAT=manylinux2010_x86_64 -v `pwd`:/io quay.io/pypa/manylinux2010_x86_64 /io/Scripts/buildscript.sh
+
+    - uses: actions/upload-artifact@v2
+      with:
+        name: CrysFML - Linux
+        path: ${{ github.workspace }}/dist/*.whl
+
+  create-OSX:
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: ['3.6', '3.7', '3.8', '3.9']
+        os: [macos-10.15]
+        gcc_v: [ 10 ] # Version of GFortran we want to use.
+#        exclude: # Currently only python > 3.8 is supported on macos-11.0 and > 3.6 on macos-10.15
+#          - os: macos-11.0
+#            python-version: '3.7'
+#          - os: macos-11.0
+#            python-version: '3.8'
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup python
+      uses: actions/setup-python@v1
+      with:
+        python-version: ${{matrix.python-version}}
+
+    - name: Install cmake
+      run: pip3 install cmake delocate wheel
+
+    - name: Build CFML (OSX)
+      env:
+        FC: gfortran-${{ matrix.gcc_v }}
+        CC: gcc-${{ matrix.gcc_v }}
+      run: |
+        pip3 wheel ./ --no-deps -w ./dist/
+        delocate-wheel -w fixed_wheels -v ./dist/*.whl
+
+    - uses: actions/upload-artifact@v2
+      with:
+        name: CrysFML - ${{ matrix.os }} - Python ${{ matrix.python-version }}
+        path: ./fixed_wheels/*.whl
 
   create-Windows:
     strategy:
-      max-parallel: 1
+      max-parallel: 4
       matrix:
         python-version: [ '3.6', '3.7', '3.8', '3.9', '3.10' ]
         os: [ windows-latest ]

Python_API/Src/CMakeLists.txt

@@ -37,13 +37,7 @@ find_package(Python3 COMPONENTS Interpreter Development)
 set(PYTHON_INTERPRETER_PATH ${Python3_EXECUTABLE})
 
 if(WIN32 OR MSYS)
-#     FIND_PACKAGE(PythonLibs REQUIRED)
-#     set(PYTHON_LIBRARY_PATH ${PYTHON_LIBRARIES})
-#     message(STATUS ${PYTHON_LIBRARY_PATH})
-#     add_library(Python3_LIB STATIC IMPORTED)
-#     set_property(TARGET Python3_LIB PROPERTY IMPORTED_LOCATION ${Python3::Python})
     target_link_libraries(${LIBRARY_NAME} Python3::Python)
-
 endif()
 
 # Set -Wl,-undefined,dynamic_lookup to OTHER_LDFLAGS