Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix python testing windows #386

Closed
wants to merge 5 commits into from
Closed

Fix python testing windows #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f35b0dc
Create consistency with WIN32 define checks
biagas Jul 29, 2024
c63889c
Update python testing on Windows.
biagas Jul 30, 2024
1c52660
WS change to trigger CI
markcmiller86 Sep 3, 2024
69881a3
Merge branch 'main' into bugfix/biagas/fix_python_testing_windows_main
biagas Sep 4, 2024
db877f8
Update steppenwolf.cmake
biagas Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMake/SiloFindSzip.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ if(SZIP_FOUND)
set(HAVE_LIBSZ 1)
if(WIN32)
get_target_property(SZIP_DLL szip IMPORTED_LOCATION_RELEASE )

if(SILO_ENABLE_SILEX OR SILO_ENABLE_BROWSER)
install(FILES ${SZIP_DLL} DESTINATION bin
PERMISSIONS OWNER_READ OWNER_WRITE
Expand Down
1 change: 1 addition & 0 deletions CMake/SiloFindZlib.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ if(ZLIB_FOUND)
set(HAVE_ZLIB_H 1)
if(WIN32)
get_target_property(ZLIB_DLL zlib IMPORTED_LOCATION_RELEASE)

if(SILO_ENABLE_SILEX OR SILO_ENABLE_BROWSER)
install(FILES ${ZLIB_DLL} DESTINATION bin
PERMISSIONS OWNER_READ OWNER_WRITE
Expand Down
2 changes: 0 additions & 2 deletions config-site/steppenwolf.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
# config-site for STEPPENWOLF, a Windows system.
###

###
# Helpers for TP lib location
###
set(TP_DIR C:/A_Visit/ForRegression/visit-deps/windowsbuild/MSVC2022)
Expand Down Expand Up @@ -98,4 +97,3 @@ silo_option_default(VAR SILO_ENABLE_PYTHON_MODULE VALUE ON TYPE BOOL)
# enable tests
silo_option_default(VAR SILO_ENABLE_TESTS VALUE ON TYPE BOOL)


1 change: 1 addition & 0 deletions tools/python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ install(FILES s2ex.py DESTINATION bin
PERMISSIONS OWNER_READ OWNER_WRITE
GROUP_READ GROUP_WRITE
WORLD_READ)

add_custom_command(TARGET SiloPy POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/s2ex.py
Expand Down
1 change: 1 addition & 0 deletions tools/python/pysilo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
// National Security, LLC, and shall not be used for advertising or
// product endorsement purposes.


#include <Python.h>
#include <silo.h>
#include "pydbfile.h"
Expand Down