fixing windows build, still can't find linux lib

mottosso · Apr 6, 2022 · c019988 · c019988
1 parent 84c21a5
commit c019988
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -146,6 +146,8 @@ jobs:
       - name: Build
         run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
 
+      - run: find ${{github.workspace}}/build -not -path '*/\.*' 
+
       - name: Artifacts
         uses: actions/upload-artifact@v3
         with:
@@ -183,13 +185,13 @@ jobs:
         # ~/modules
         #   /cmdc-0.1.0
         #     windows-2020.4/cmdc.pyd
-        #     windows-2022/cmdc.pyd
+        #     windows-2022.3/cmdc.pyd
         #     windows-2023/cmdc.pyd
         #     linux-2020.4/cmdc.so
-        #     linux-2022/cmdc.so
+        #     linux-2022.3/cmdc.so
         #     linux-2023/cmdc.so
-        #     macos-2020/cmdc.so
-        #     macos-2022/cmdc.so
+        #     macos-2020.4/cmdc.so
+        #     macos-2022.3/cmdc.so
         #     macos-2023/cmdc.so
         #   /stubs/cmdc.pyi
         #   /cmdc.mod

diff --git a/cmake/MayaConfig.cmake b/cmake/MayaConfig.cmake
@@ -5,7 +5,7 @@ if (WIN32)
     string(REPLACE "." "" PYTHON_VERSION_NO ${PYBIND11_PYTHON_VERSION})
     set(PYTHON_LIB_FILENAME "python${PYTHON_VERSION_NO}.lib")
 
-    if (${MAYA_VERSION} VERSION_EQUAL "2022")
+    if (${MAYA_VERSION} VERSION_GREATER_EQUAL "2022")
         set(PYTHON_INCLUDE_DIR "${MAYA_DEVKIT_ROOT}/include/Python${PYTHON_VERSION_NO}/Python")
     else()
         set(PYTHON_INCLUDE_DIR "${MAYA_DEVKIT_ROOT}/include/Python")