diff --git a/CMakeLists.txt b/CMakeLists.txt index 96d67611..a8956593 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,11 +85,6 @@ find_package(Sanitizers REQUIRED) #clang tools ############################################################################################# # conan -if(NOT DEFINED CMAKE_TOOLCHAIN_FILE) - message(STATUS "CMAKE DEFINE CMAKE_TOOLCHAIN_FILE") - set(CMAKE_TOOLCHAIN_FILE "conan_toolchain.cmake" CACHE FILEPATH "Path to the toolchain file") -endif() - message(STATUS "DCMAKE_TOOLCHAIN_FILE = ${CMAKE_TOOLCHAIN_FILE}") if(POLICY CMP0167) diff --git a/docker/Dockerfile-manylinux2014 b/docker/Dockerfile-manylinux2014 index 0441f407..632f7ab0 100644 --- a/docker/Dockerfile-manylinux2014 +++ b/docker/Dockerfile-manylinux2014 @@ -38,8 +38,8 @@ RUN PYBIN=(/opt/python/*/bin) && \ if [[ ${BIN} == *"cp311"* ]]; then \ ${BIN}/python3 -m pip install --no-cache-dir wheel setuptools scikit-build==0.16.4 && \ mkdir -p $(echo "./$(${BIN}/python3 get_path.py )") && \ - conan install . -s build_type=Release -g CMakeDeps -g CMakeToolchain -if=$(echo "./$(${BIN}/python3 get_path.py )") && \ - ${BIN}/python3 setup.py bdist_wheel --verbose -DCMAKE_BUILD_TYPE=Release -DDEV_MODE=ON && \ + conan install . -s build_type=Release -g CMakeDeps -if=$(echo "./$(${BIN}/python3 get_path.py )") && \ + ${BIN}/python3 setup.py bdist_wheel --verbose -DDEV_MODE=ON && \ #${BIN}/python3 -m pip install --no-index --find-links . dist/otterbrix-*.whl && \ cd $(echo "./$(${BIN}/python3 get_path.py )") && \ ctest -C -V --output-on-failure --timeout 60 && \