File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 8484 echo "PYTHONPATH=${{ github.workspace }}/_python" >> $GITHUB_ENV
8585 PYTHON_EXECUTABLE=$(which python)
8686 echo "PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}" >> $GITHUB_ENV
87+ PYVER=$(python -c "import sys; print(f'{sys.version_info.major}{sys.version_info.minor}')")
88+ echo "PYVER=${PYVER}" >> $GITHUB_ENV
89+
8790 shell : bash
8891
8992 - name : Set Up Conan
@@ -144,6 +147,9 @@ jobs:
144147 # On Windows, Conan requires CMP0091, which controls how CMAKE_MSVC_RUNTIME_LIBRARY is set
145148 if [[ "$RUNNER_OS" == "Windows" ]]; then
146149 cmake_args+=("-DCMAKE_POLICY_DEFAULT_CMP0091=NEW")
150+ if [ -n "${{ env.PYVER }}" ]; then
151+ cmake_args+=("-DPython_LIBRARY=${{ env.pythonLocation }}/libs/python${{ env.PYVER }}.lib")
152+ fi
147153 fi
148154 if [ -n "${{ inputs.namespace }}" ]; then
149155 cmake_args+=("-DIMATH_NAMESPACE=${{ inputs.namespace }}")
Original file line number Diff line number Diff line change @@ -7,16 +7,16 @@ if(POLICY CMP0177)
77 cmake_policy (SET CMP0177 NEW )
88endif ()
99
10- set (Python3_USE_DEBUG_PATH FALSE )
10+ # set(Python3_USE_DEBUG_PATH FALSE)
1111
1212find_package (Python3 REQUIRED COMPONENTS Interpreter Development )
1313
1414if (NOT Python3_FOUND)
1515 message (FATAL_ERROR "Could not find Python" )
1616endif ()
1717
18- #if(CMAKE_BUILD_TYPE STREQUAL "Debug")
19- # set(Boost_USE_DEBUG_RUNTIME ON )
18+ #if(MSVC AND CMAKE_BUILD_TYPE STREQUAL "Debug")
19+ # set(PYTHON_LIBRARY_DEBUG "${PYTHON_LIBRARY_RELEASE}" )
2020#endif()
2121
2222find_package (Boost REQUIRED COMPONENTS python )
You can’t perform that action at this time.
0 commit comments