Commit 097bae4d authored by Deepak Rangarajan's avatar Deepak Rangarajan Committed by Mark Meredith
Browse files

remove pmm

parent 5ef9db60
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ test:meson:

test:cmake:
  script:
    - python -m pip install cmake ninja
    - python -m pip install cmake ninja conan
    - cmake -S. -Bbuild -GNinja -DCMAKE_BUILD_TYPE=Debug
    - cmake --build build --target unit_tests_csg
    - cd build
+13 −5
Original line number Diff line number Diff line
@@ -15,11 +15,19 @@ if(CCACHE_FOUND)
  set( CMAKE_CXX_COMPILER_LAUNCHER ccache )
endif()

find_program(CONAN_FOUND conan)
if(CONAN_FOUND)
  message(STATUS "Using conan found at: ${CONAN_FOUND}")
  include(conan.cmake)
  conan_cmake_run(CONANFILE conanfile.txt
    BASIC_SETUP CMAKE_TARGETS)
else()
  message(WARNING "conan not found in PATH.  Going to try download it with PMM <https://github.com/vector-of-bool/pmm>")
  include(pmm.cmake)
  pmm(CONAN)

  conan_basic_setup()
  include(${CMAKE_CURRENT_BINARY_DIR}/conanbuildinfo.cmake)
endif()

include(CTest)
include(Catch)

conan.cmake

0 → 100644
+610 −0

File added.

Preview size limit exceeded, changes collapsed.