Skip to content

Commit 1f5938c

Browse files
committed
test160
Signed-off-by: Cary Phillips <cary@ilm.com>
1 parent efcc87a commit 1f5938c

3 files changed

Lines changed: 3 additions & 14 deletions

File tree

.github/workflows/ci_steps.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ jobs:
9797
run: |
9898
CONAN_ROOT="${{ github.workspace }}/_conan"
9999
conan profile detect
100-
conan install . --output-folder="${CONAN_ROOT}" --build=missing
100+
conan install . --output-folder="${CONAN_ROOT}" --build=missing \
101+
-c tools.cmake.cmaketoolchain:generator=Ninja \
102+
-c tools.cmake.cmaketoolchain:platform=""
101103
echo "CONAN_ROOT=${CONAN_ROOT}" >> $GITHUB_ENV
102104
echo "CMAKE_TOOLCHAIN_FILE=${CONAN_ROOT}/conan_toolchain.cmake" >> $GITHUB_ENV
103105
shell: bash

src/python/CMakeLists.txt

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

10-
set(Python_LIBRARIES "C:\\hostedtoolcache\\windows\\Python\\3.9.13\\x64\\libs")
11-
set(Python_LIBRARY "C:\\hostedtoolcache\\windows\\Python\\3.9.13\\x64\\libs")
12-
set(Python3_USE_DEBUG_LIBRARY OFF)
13-
set(Python3_DEBUG_LIBRARIES "${Python3_LIBRARIES}")
14-
set(Python3_LIBRARY_DEBUG "${Python3_LIBRARY}")
15-
1610
find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
1711

1812
if(NOT Python3_FOUND)
@@ -25,7 +19,6 @@ if(NOT Boost_FOUND)
2519
message(FATAL_ERROR "Could not find Boost")
2620
endif()
2721

28-
2922
add_subdirectory( PyImath )
3023
add_subdirectory( PyImathNumpy )
3124

src/python/PyImath/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,6 @@ set(PYIMATH_HEADERS
9191
PyImathVecOperators.h
9292
)
9393

94-
execute_process(
95-
COMMAND ${Python3_EXECUTABLE} -c "import sysconfig; print(sysconfig.get_config_vars())"
96-
OUTPUT_VARIABLE CONFIG_VARS
97-
)
98-
message(STATUS "CONFIG_VARS: ${CONFIG_VARS}")
99-
10094
if(BUILD_SHARED_LIBS)
10195
add_library(${PYIMATH_LIBRARY} SHARED ${PYIMATH_SOURCES})
10296
target_compile_definitions(${PYIMATH_LIBRARY} PRIVATE IMATH_EXPORTS)

0 commit comments

Comments
 (0)