Skip to content

Commit 266c520

Browse files
build: Conan windows aqt hwloc (#2317)
Co-authored-by: RobBuchanan <robertbb269@hotmail.com>
1 parent cd5f15e commit 266c520

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

.github/workflows/build/windows/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ runs:
6464

6565
- name: Install Python Dependencies
6666
shell: bash
67-
run: pip3 install aqtinstall conan
67+
run: pip3 install py7zr==1.1.0 aqtinstall conan
6868

6969
#
7070
# Install Qt

CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@ if(CONAN)
99
file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/refs/heads/develop2/conan_provider.cmake"
1010
"${CMAKE_CURRENT_LIST_DIR}/cmake/Modules/conan_provider.cmake"
1111
)
12+
else()
13+
if(MSVC_DEV)
14+
message(
15+
"Conan provider .cmake file already exists.
16+
For MSVC developers, an existing conan_provider.cmake may interfere with CMake configuration for the project, when conan has not already successfully installed packages.
17+
Try deleting this file and reconfiguring if problems are encountered."
18+
)
19+
endif(MSVC_DEV)
1220
endif()
1321

1422
# Add local dirs to cmake Module search path

conanfile.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ class DissolveRecipe(ConanFile):
1414
"msvc_dev": False,
1515
}
1616
def configure(self):
17-
self.options["puxixml"].header_only = False
17+
self.options["hwloc"].shared = True
18+
self.options["pugixml"].header_only = False
1819
self.options["antlr4-cppruntime"].shared = True
1920

2021
def build(self):

develop.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ Write-Host "Activating Python virtual environment... " @info_colors
209209

210210
Write-Host "Installing Python packages... " @info_colors
211211
& $python -m pip install --upgrade pip
212-
& $python -m pip install aqtinstall conan
212+
& $python -m pip install py7zr==1.1.0 aqtinstall conan cmake-format
213213

214214
$pythonEnvPath = Join-Path -Path $projectDir -ChildPath "msvc-env\$pythonEnvSourceDir"
215215

0 commit comments

Comments
 (0)