Adding specific support for 2018 and 2019 windows

mottosso · Apr 13, 2022 · 5e32ebe · 5e32ebe
1 parent 8c55dd5
commit 5e32ebe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -56,7 +56,7 @@ jobs:
           Expand-Archive -LiteralPath devkit.zip -DestinationPath $pwd
 
       - name: Configure CMake
-        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DMAYA_VERSION=${{matrix.maya}} -DMAYA_DEVKIT_ROOT="$pwd/devkitBase"
+        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DMAYA_VERSION="${{matrix.maya}}" -DMAYA_DEVKIT_ROOT="$pwd/devkitBase"
 
       - name: Build
         run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

diff --git a/cmake/MayaConfig.cmake b/cmake/MayaConfig.cmake
@@ -7,6 +7,8 @@ if (WIN32)
 
     if (${MAYA_VERSION} VERSION_GREATER_EQUAL "2022")
         set(PYTHON_INCLUDE_DIR "${MAYA_DEVKIT_ROOT}/include/Python${PYTHON_VERSION_NO}/Python")
+    elseif(${MAYA_VERSION} VERSION_EQUAL "2018" OR ${MAYA_VERSION} VERSION_EQUAL 2019)
+        set(PYTHON_INCLUDE_DIR "${MAYA_DEVKIT_ROOT}/include/Python${PYBIND11_PYTHON_VERSION}/Python")
     else()
         set(PYTHON_INCLUDE_DIR "${MAYA_DEVKIT_ROOT}/include/Python")
     endif()