diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 7280a43..9afef8c 100644 --- 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 index 64a16a9..2f15112 100644 --- 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()