diff --git a/CMakePresets.json b/CMakePresets.json index 2ab2f39048..b6d9d067c2 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -121,7 +121,6 @@ "lhs": "${hostSystemName}", "rhs": "Linux" }, - "cmakeExecutable": "${sourceDir}/conda/cmake.sh", "cacheVariables": { "CMAKE_C_COMPILER": { "type": "STRING", @@ -161,7 +160,6 @@ "lhs": "${hostSystemName}", "rhs": "Darwin" }, - "cmakeExecutable": "${sourceDir}/conda/cmake.sh", "cacheVariables": { "CMAKE_IGNORE_PREFIX_PATH": { "type": "STRING", @@ -189,7 +187,6 @@ "lhs": "${hostSystemName}", "rhs": "Windows" }, - "cmakeExecutable": "${sourceDir}/conda/cmake.cmd", "cacheVariables": { "CMAKE_INSTALL_PREFIX": { "type": "FILEPATH", diff --git a/conda/cmake.cmd b/conda/cmake.cmd deleted file mode 100644 index 3f63072703..0000000000 --- a/conda/cmake.cmd +++ /dev/null @@ -1 +0,0 @@ -mamba run --live-stream -n freecad cmake %* diff --git a/conda/cmake.sh b/conda/cmake.sh deleted file mode 100755 index 958e1a8da4..0000000000 --- a/conda/cmake.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -mamba run --live-stream -n freecad cmake $@ diff --git a/conda/conda-env-qt6.yaml b/conda/conda-env-qt6.yaml deleted file mode 100644 index 77d325217e..0000000000 --- a/conda/conda-env-qt6.yaml +++ /dev/null @@ -1,9 +0,0 @@ -name: freecad -channels: -- conda-forge -dependencies: -- conda-forge/noarch::conda-libmamba-solver==24.11.1 -- conda-devenv -- mamba -- python==3.12.* -- zstd diff --git a/conda/conda-env.yaml b/conda/conda-env.yaml deleted file mode 100644 index 495ce08296..0000000000 --- a/conda/conda-env.yaml +++ /dev/null @@ -1,9 +0,0 @@ -name: freecad -channels: -- conda-forge -dependencies: -- conda-forge/noarch::conda-libmamba-solver==24.11.1 -- conda-devenv -- mamba -- python==3.11.* -- zstd==1.5.6 diff --git a/conda/environment-qt6.devenv.yml b/conda/environment-qt6.devenv.yml deleted file mode 100644 index 7a8c8dd7c8..0000000000 --- a/conda/environment-qt6.devenv.yml +++ /dev/null @@ -1,101 +0,0 @@ -name: freecad -channels: -- conda-forge -- conda-forge/label/pivy_rc -dependencies: -- conda-forge/noarch::conda-libmamba-solver==24.11.1 -- libspnav # [linux] -- kernel-headers_linux-64 # [linux and x86_64] -- libdrm-cos7-x86_64 # [linux and x86_64] -- libselinux-cos7-x86_64 # [linux and x86_64] -- libsepol-cos7-x86_64 # [linux and x86_64] -- libx11-common-cos7-x86_64 # [linux and x86_64] -- libx11-cos7-x86_64 # [linux and x86_64] -- libxau-cos7-x86_64 # [linux and x86_64] -- libxcb-cos7-x86_64 # [linux and x86_64] -- libxdamage-cos7-x86_64 # [linux and x86_64] -- libxext-cos7-x86_64 # [linux and x86_64] -- libxfixes-cos7-x86_64 # [linux and x86_64] -- libxi-cos7-x86_64 # [linux and x86_64] -- libxi-devel-cos7-x86_64 # [linux and x86_64] -- libxxf86vm-cos7-x86_64 # [linux and x86_64] -- mesa-dri-drivers-cos7-x86_64 # [linux and x86_64] -- mesa-libegl-cos7-x86_64 # [linux and x86_64] -- mesa-libegl-devel-cos7-x86_64 # [linux and x86_64] -- mesa-libgl-cos7-x86_64 # [linux and x86_64] -- mesa-libgl-devel-cos7-x86_64 # [linux and x86_64] -- pixman-cos7-x86_64 # [linux and x86_64] -- sysroot_linux-64 # [linux and x86_64] -- xorg-x11-server-common-cos7-x86_64 # [linux and x86_64] -- xorg-x11-server-xvfb-cos7-x86_64 # [linux and x86_64] -- kernel-headers_linux-aarch64 # [linux and aarch64] -- libdrm-cos7-aarch64 # [linux and aarch64] -- libglvnd-cos7-aarch64 # [linux and aarch64] -- libglvnd-glx-cos7-aarch64 # [linux and aarch64] -- libselinux-cos7-aarch64 # [linux and aarch64] -- libsepol-cos7-aarch64 # [linux and aarch64] -- libx11-common-cos7-aarch64 # [linux and aarch64] -- libx11-cos7-aarch64 # [linux and aarch64] -- libxau-cos7-aarch64 # [linux and aarch64] -- libxcb-cos7-aarch64 # [linux and aarch64] -- libxdamage-cos7-aarch64 # [linux and aarch64] -- libxext-cos7-aarch64 # [linux and aarch64] -- libxfixes-cos7-aarch64 # [linux and aarch64] -- libxi-cos7-aarch64 # [linux and aarch64] -- libxi-devel-cos7-aarch64 # [linux and aarch64] -- libxxf86vm-cos7-aarch64 # [linux and aarch64] -- mesa-dri-drivers-cos7-aarch64 # [linux and aarch64] -- mesa-khr-devel-cos7-aarch64 # [linux and aarch64] -- mesa-libegl-cos7-aarch64 # [linux and aarch64] -- mesa-libegl-devel-cos7-aarch64 # [linux and aarch64] -- mesa-libgbm-cos7-aarch64 # [linux and aarch64] -- mesa-libgl-cos7-aarch64 # [linux and aarch64] -- mesa-libgl-devel-cos7-aarch64 # [linux and aarch64] -- mesa-libglapi-cos7-aarch64 # [linux and aarch64] -- pixman-cos7-aarch64 # [linux and aarch64] -- sysroot_linux-aarch64 # [linux and aarch64] -- xorg-x11-server-common-cos7-aarch64 # [linux and aarch64] -- xorg-x11-server-xvfb-cos7-aarch64 # [linux and aarch64] -- sed # [unix] -- ccache -- clang-format -- cmake -- coin3d -- compilers -- conda -- conda-devenv -- debugpy -- doxygen -- eigen -- fmt -- freetype -- git -- gmsh -- graphviz -- hdf5 -- libboost-devel -- libcxx -- mamba -- matplotlib -- ninja -- numpy -- occt -- openssl -- pcl -- pip -- conda-forge/label/pivy_rc::pivy -- pkg-config -- ply -- pre-commit -- pybind11 -- pyside6 -- python==3.12.* -- pyyaml -- qt6-main -- smesh -- swig -- vtk==9.2.6 -- xerces-c -- yaml-cpp -- zlib -- zstd diff --git a/conda/environment.devenv.yml b/conda/environment.devenv.yml deleted file mode 100644 index 022a353490..0000000000 --- a/conda/environment.devenv.yml +++ /dev/null @@ -1,101 +0,0 @@ -name: freecad -channels: -- conda-forge -dependencies: -- conda-forge/noarch::conda-libmamba-solver==24.11.1 -- libspnav # [linux] -- kernel-headers_linux-64 # [linux and x86_64] -- libdrm-cos6-x86_64 # [linux and x86_64] -- libselinux-cos6-x86_64 # [linux and x86_64] -- libsepol-cos6-x86_64 # [linux and x86_64] -- libx11-common-cos6-x86_64 # [linux and x86_64] -- libx11-cos6-x86_64 # [linux and x86_64] -- libxau-cos6-x86_64 # [linux and x86_64] -- libxcb-cos6-x86_64 # [linux and x86_64] -- libxdamage-cos6-x86_64 # [linux and x86_64] -- libxext-cos6-x86_64 # [linux and x86_64] -- libxfixes-cos6-x86_64 # [linux and x86_64] -- libxi-cos6-x86_64 # [linux and x86_64] -- libxi-devel-cos6-x86_64 # [linux and x86_64] -- libxxf86vm-cos6-x86_64 # [linux and x86_64] -- mesa-dri-drivers-cos6-x86_64 # [linux and x86_64] -- mesa-dri1-drivers-cos6-x86_64 # [linux and x86_64] -- mesa-libegl-cos6-x86_64 # [linux and x86_64] -- mesa-libegl-devel-cos6-x86_64 # [linux and x86_64] -- mesa-libgl-cos6-x86_64 # [linux and x86_64] -- mesa-libgl-devel-cos6-x86_64 # [linux and x86_64] -- pixman-cos6-x86_64 # [linux and x86_64] -- sysroot_linux-64 # [linux and x86_64] -- xorg-x11-server-common-cos6-x86_64 # [linux and x86_64] -- xorg-x11-server-xvfb-cos6-x86_64 # [linux and x86_64] -- kernel-headers_linux-aarch64 # [linux and aarch64] -- libdrm-cos7-aarch64 # [linux and aarch64] -- libglvnd-cos7-aarch64 # [linux and aarch64] -- libglvnd-glx-cos7-aarch64 # [linux and aarch64] -- libselinux-cos7-aarch64 # [linux and aarch64] -- libsepol-cos7-aarch64 # [linux and aarch64] -- libx11-common-cos7-aarch64 # [linux and aarch64] -- libx11-cos7-aarch64 # [linux and aarch64] -- libxau-cos7-aarch64 # [linux and aarch64] -- libxcb-cos7-aarch64 # [linux and aarch64] -- libxdamage-cos7-aarch64 # [linux and aarch64] -- libxext-cos7-aarch64 # [linux and aarch64] -- libxfixes-cos7-aarch64 # [linux and aarch64] -- libxi-cos7-aarch64 # [linux and aarch64] -- libxi-devel-cos7-aarch64 # [linux and aarch64] -- libxxf86vm-cos7-aarch64 # [linux and aarch64] -- mesa-dri-drivers-cos7-aarch64 # [linux and aarch64] -- mesa-khr-devel-cos7-aarch64 # [linux and aarch64] -- mesa-libegl-cos7-aarch64 # [linux and aarch64] -- mesa-libegl-devel-cos7-aarch64 # [linux and aarch64] -- mesa-libgbm-cos7-aarch64 # [linux and aarch64] -- mesa-libgl-cos7-aarch64 # [linux and aarch64] -- mesa-libgl-devel-cos7-aarch64 # [linux and aarch64] -- mesa-libglapi-cos7-aarch64 # [linux and aarch64] -- pixman-cos7-aarch64 # [linux and aarch64] -- sysroot_linux-aarch64 # [linux and aarch64] -- xorg-x11-server-common-cos7-aarch64 # [linux and aarch64] -- xorg-x11-server-xvfb-cos7-aarch64 # [linux and aarch64] -- sed # [unix] -- ccache -- clang-format -- cmake -- coin3d -- compilers -- conda -- conda-devenv -- debugpy -- doxygen -- eigen -- fmt -- freetype -- git -- gmsh -- graphviz -- hdf5 -- libboost-devel -- libcxx -- mamba -- matplotlib -- ninja -- numpy -- occt -- openssl -- pcl -- pip -- pivy -- pkg-config -- ply -- pre-commit -- pybind11 -- pyside2 -- python==3.11.* -- pyyaml -- qt-main -- smesh -- swig -- vtk==9.2.6 -- xerces-c -- yaml-cpp -- zlib -- zstd==1.5.6 diff --git a/conda/setup-environment-qt6.sh b/conda/setup-environment-qt6.sh deleted file mode 100755 index d656491fb3..0000000000 --- a/conda/setup-environment-qt6.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# create the conda environment as a subdirectory -mamba env create -p .conda/freecad -f conda/conda-env.yaml - -# add the environment subdirectory to the conda configuration -conda config --add envs_dirs $CONDA_PREFIX/envs -conda config --add envs_dirs $(pwd)/.conda -conda config --set env_prompt "({name})" - -# install the FreeCAD dependencies into the environment -mamba run --live-stream -n freecad mamba-devenv --no-prune -f conda/environment-qt6.devenv.yml diff --git a/conda/setup-environment.cmd b/conda/setup-environment.cmd deleted file mode 100644 index dd51d7c739..0000000000 --- a/conda/setup-environment.cmd +++ /dev/null @@ -1,10 +0,0 @@ -:: create the conda environment as a subdirectory -call mamba env create -p .conda/freecad -f conda/conda-env.yaml - -:: add the environment subdirectory to the conda configuration -call conda config --add envs_dirs %CONDA_PREFIX%/envs -call conda config --add envs_dirs %CD%/.conda -call conda config --set env_prompt "({name})" - -:: install the FreeCAD dependencies into the environment -call mamba run --live-stream -n freecad mamba-devenv --no-prune -f conda/environment.devenv.yml diff --git a/conda/setup-environment.sh b/conda/setup-environment.sh deleted file mode 100755 index bd75d76602..0000000000 --- a/conda/setup-environment.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# create the conda environment as a subdirectory -mamba env create -p .conda/freecad -f conda/conda-env.yaml - -# add the environment subdirectory to the conda configuration -conda config --add envs_dirs $CONDA_PREFIX/envs -conda config --add envs_dirs $(pwd)/.conda -conda config --set env_prompt "({name})" - -# install the FreeCAD dependencies into the environment -mamba run --live-stream -n freecad mamba-devenv --no-prune -f conda/environment.devenv.yml