Skip to content

Commit 7db2fdc

Browse files
committed
test118
Signed-off-by: Cary Phillips <cary@ilm.com>
1 parent 56b6b11 commit 7db2fdc

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

.github/workflows/ci_steps.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ jobs:
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 }}")

src/python/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ if(POLICY CMP0177)
77
cmake_policy(SET CMP0177 NEW)
88
endif()
99

10-
set(Python3_USE_DEBUG_PATH FALSE)
10+
#set(Python3_USE_DEBUG_PATH FALSE)
1111

1212
find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
1313

1414
if(NOT Python3_FOUND)
1515
message(FATAL_ERROR "Could not find Python")
1616
endif()
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

2222
find_package(Boost REQUIRED COMPONENTS python)

0 commit comments

Comments
 (0)