Skip to content

Commit 724d59d

Browse files
committed
test130
Signed-off-by: Cary Phillips <cary@ilm.com>
1 parent 082a26a commit 724d59d

3 files changed

Lines changed: 15 additions & 15 deletions

File tree

.github/workflows/ci_steps.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,19 @@ jobs:
8989
9090
shell: bash
9191

92+
- name: Create symlink for Windows python debug lib
93+
if: inputs.python == 'ON' && inputs.build-type == 'Debug' && contains(inputs.os, 'windows')
94+
run: |
95+
root="/c/hostedtoolcache/windows/Python"
96+
lib=$(find "$root" -type f -name "python*_d.lib" | head -n 1)
97+
if [ -n "$lib" ]; then
98+
ln -s "$lib" "${lib/_d/}"
99+
echo "Symlink created: $lib {$lib/_d/}
100+
else
101+
echo "No python debug lib found"
102+
fi
103+
shell: bash
104+
92105
- name: Set Up Conan
93106
if: inputs.python == 'ON'
94107
run: |
@@ -149,7 +162,7 @@ jobs:
149162
cmake_args+=("-DCMAKE_POLICY_DEFAULT_CMP0091=NEW")
150163
if [ "${{ inputs.python }}" == "ON" ]; then
151164
PYTHON_DIR=$(dirname ${{ env.PYTHON_EXECUTABLE }})
152-
cmake_args+=("-DCMAKE_FIND_DEBUG_MODE=ON")
165+
# cmake_args+=("-DCMAKE_FIND_DEBUG_MODE=ON")
153166
cmake_args+=("-DPython3_LIBRARY=C:/hostedtoolcache/windows/Python/3.9.13/x64/libs/python39.lib")
154167
cmake_args+=("-DPython3_INCLUDE_DIR=C:/hostedtoolcache/windows/Python/3.9.13/x64/include")
155168
cmake_args+=("-DPython3_EXECUTABLE=C:/hostedtoolcache/windows/Python/3.9.13/x64/python.exe")

.github/workflows/ci_workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ jobs:
166166
# label: Release
167167

168168
- build: 2
169-
label: RelWithDebInfo # Debug
169+
label: Debug
170170
build-type: Debug
171171

172172
# - build: 3

src/python/CMakeLists.txt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,6 @@ if(NOT Python3_FOUND)
1515
message(FATAL_ERROR "Could not find Python")
1616
endif()
1717

18-
message(STATUS "Python3_LIBRARIES=${Python3_LIBRARIES}")
19-
20-
if(Python3_LIBRARIES MATCHES "_d\\.lib$")
21-
message(STATUS "Overriding Debug Python library with non-debug version")
22-
string(REGEX REPLACE "_d\\.lib$" ".lib" PYTHON3_NON_DEBUG_LIB "${Python3_LIBRARIES}")
23-
set(Python3_LIBRARIES "${PYTHON3_NON_DEBUG_LIB}")
24-
message(STATUS "Using Python library: ${Python3_LIBRARIES}")
25-
endif()
26-
27-
#if(MSVC AND CMAKE_BUILD_TYPE STREQUAL "Debug")
28-
# set(PYTHON_LIBRARY_DEBUG "${PYTHON_LIBRARY_RELEASE}")
29-
#endif()
30-
3118
find_package(Boost REQUIRED COMPONENTS python)
3219

3320
if(NOT Boost_FOUND)

0 commit comments

Comments
 (0)