Merge remote-tracking branch 'origin/dev' into dev-ndy

.github/workflows/cmake_python_binding.yml

@@ -41,6 +41,4 @@ jobs:
     
     - name: Test
       working-directory: ${{env.CMAKELISTS_DIR}}
-      run:  |
-        conan export ../io
-        conan create test --build=missing --settings=compiler.cppstd=20
+      run: conan create test --build=missing --settings=compiler.cppstd=20

.github/workflows/cmake_renderer.yml

@@ -43,19 +43,17 @@ jobs:
         conan export ../core       
         conan export ../io/chemfiles
         conan export ../io
-        conan create bench --build=missing --settings=compiler.cppstd=20 -c tools.system.package_manager:mode=install -c tools.system.package_manager:sudo=True
+        conan create bench --build=missing --settings=compiler.cppstd=20 -c tools.system.package_manager:mode=install -c tools.system.package_manager:sudo=True --format=json > output.json
 
-#    - name: Install
-#      if: runner.os == 'Windows'
-#      working-directory: ${{env.CMAKELISTS_DIR}}/${{env.CMAKE_BUILD_DIR}}
-#      run: cmake --install . --config ${{env.BUILD_TYPE}} --prefix ${{env.CMAKELISTS_DIR}}/${{env.CMAKE_INSTALL_DIR}}
-#    - name: Install
-#      if: runner.os == 'Linux' || runner.os == 'macOS'
-#      working-directory: ${{env.CMAKELISTS_DIR}}/${{env.CMAKE_BUILD_DIR}}
-#      run: sudo cmake --install . --config ${{env.BUILD_TYPE}} --prefix ${{env.CMAKELISTS_DIR}}/${{env.CMAKE_INSTALL_DIR}}
+    - name: Read package path from output.json
+      id: read_package_path
+      working-directory: ${{env.CMAKELISTS_DIR}}
+      run: echo "PACKAGE_PATH=$(jq -r '.graph.nodes["1"].package_folder' output.json)" >> "$GITHUB_OUTPUT"
+      shell: bash
 
-#    - uses: actions/upload-artifact@v3
-#      with:
-#        name: VTXRendererBench_${{runner.os}}
-#        path: ${{env.CMAKELISTS_DIR}}/${{env.CMAKE_INSTALL_DIR}}/VTXRendererBench
-
+    - uses: actions/upload-artifact@v3
+      env:
+        PACKAGE_PATH: ${{ steps.read_package_path.outputs.PACKAGE_PATH }}
+      with:
+        name: VTXRendererBench_${{runner.os}}
+        path: ${{env.PACKAGE_PATH}}

README.md

@@ -127,6 +127,7 @@ Please [take a look there](https://chemfiles.org/chemfiles/latest/formats.html).
 
 - Install Visual Studio, or Visual Code, or just MSVC compiler if you don't want to use any IDE
 - Install [Conan 2](https://conan.io/downloads)
+- Install [Python 3.9](https://www.python.org/downloads/)
 
 ### Create Conan profile
 

conanfile.py

@@ -34,7 +34,7 @@ def generate(self):
         tc.cache_variables["PATH_PYTHON_MODULE"] = path_python_module
         tc.generate()
 
-        copy(self, "*.dll", self.dependencies["vtx_ui"].cpp_info.bindir, self.build_folder)
+        copy(self, "*.dll", self.dependencies["vtx_ui"].cpp_info.bindir, os.path.join(self.build_folder, self.cpp.build.libdirs[0]))
 
     def layout(self):
         cmake_layout(self)

lib/python_binding/conanfile.py

@@ -30,10 +30,8 @@ def config_options(self):
     def layout(self):
         cmake_layout(self)
 
-        generator = self.conf.get("tools.cmake.cmaketoolchain:generator")
-        bt = str(self.settings.build_type) if self.settings.os == "Windows" and generator != "Ninja" else "."
-        self.cpp.build.components["vtx_python_binding"].libdirs = [bt]
-        self.cpp.build.components["pytx"].libdirs = [bt]
+        self.cpp.build.components["vtx_python_binding"].libdirs = self.cpp.build.libdirs
+        self.cpp.build.components["pytx"].libdirs = self.cpp.build.libdirs
 
     def build(self):
         cmake = CMake(self)

lib/renderer/bench/conanfile.py

@@ -20,7 +20,7 @@ def requirements(self):
         self.requires("vtx_core/1.0")
         self.requires("vtx_io/1.0")
         self.requires("sdl/2.28.3")
-        self.requires("imgui/1.89.9")
+        self.requires("imgui/1.90")
 
     def generate(self):
         tc = CMakeToolchain(self)

lib/ui/conanfile.py

@@ -1,5 +1,4 @@
 import os
-import glob
 from conan import ConanFile
 from conan.tools.cmake import CMake, cmake_layout
 from conan.tools.files import copy
@@ -34,8 +33,8 @@ def layout(self):
 
     def generate(self):
         copy(self, "*.cmake", self.source_folder, self.build_folder)
-        copy(self, "*.dll", self.dependencies["qt"].cpp_info.bindir, self.build_folder)
-        copy(self, "*.dll", os.path.join(self.dependencies["qt"].package_folder, "res/archdatadir/plugins"), self.build_folder)
+        copy(self, "*.dll", self.dependencies["qt"].cpp_info.bindir, os.path.join(self.build_folder, self.cpp.build.libdirs[0]))
+        copy(self, "*.dll", os.path.join(self.dependencies["qt"].package_folder, "res/archdatadir/plugins"), os.path.join(self.build_folder, self.cpp.build.libdirs[0]))
 
     def build(self):
         cmake = CMake(self)

lib/ui/test/conanfile.py

@@ -27,7 +27,7 @@ def layout(self):
         cmake_layout(self)
 
     def generate(self):
-        copy(self, "*.dll", self.dependencies["vtx_ui"].cpp_info.bindir, self.build_folder)
+        copy(self, "*.dll", self.dependencies["vtx_ui"].cpp_info.bindir, os.path.join(self.build_folder, self.cpp.build.libdirs[0]))
 
     def build(self):
         cmake = CMake(self)