Merge branch 'main' of...

Merge branch 'main' of gitlab.synchrotron-soleil.fr:software-control-system/factory/conan/conan2-config

profiles/win10-msvc12_x86-x86-shared → profiles/el6-gcc44_gnu11-x86-shared

 [settings]
 arch=x86
 build_type=RelWithDebInfo
-compiler=msvc
-compiler.runtime=dynamic
-compiler.version=180
-os=Windows
+compiler=gcc
+compiler.cppstd=gnu11
+compiler.libcxx=libstdc++
+compiler.version=4.4
+os=Linux
 
 [options]
 *:shared=True
-
-[buildenv]
-PATH=+(path)D:\Python\Python36-32
-PYTHONHOME=D:\Python\Python36-32
+xpix/*:shared=False

profiles/el6-gcc44_gnu11-x86_64-shared

+[settings]
+arch=x86_64
+build_type=RelWithDebInfo
+compiler=gcc
+compiler.cppstd=gnu11
+compiler.libcxx=libstdc++
+compiler.version=4.4
+os=Linux
+
+[options]
+*:shared=True

profiles/win10-msvc12_x86-x86-static

-[settings]
-arch=x86
-build_type=RelWithDebInfo
-compiler=msvc
-compiler.runtime=static
-compiler.version=180
-os=Windows
-
-[buildenv]
-PATH=+(path)D:\Python\Python36-32
-PYTHONHOME=D:\Python\Python36-32