Unverified Commit 93feafaa authored by davidak's avatar davidak Committed by GitHub
Browse files

Merge pull request #216402 from hesiod/cctag

cctag: init at 1.0.3
parents 5f0d203e 3bc6ed6e
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -209,7 +209,7 @@
   target_include_directories(CCTag
                            PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>"
                                   "$<BUILD_INTERFACE:${generated_dir}>"
-                                  "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>"
+                                  "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
                            PUBLIC ${Boost_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS})
 
   # just for testing
+66 −0
Original line number Diff line number Diff line
{ lib
, stdenv
, fetchFromGitHub

, cmake
, boost
, eigen
, opencv
, tbb

, avx2Support ? stdenv.hostPlatform.avx2Support
}:

stdenv.mkDerivation rec {
  pname = "cctag";
  version = "1.0.3";

  outputs = [ "lib" "dev" "out" ];

  src = fetchFromGitHub {
    owner = "alicevision";
    repo = "CCTag";
    rev = "v${version}";
    hash = "sha256-foB+e7BCuUucyhN8FsI6BIT3/fsNLTjY6QmjkMWZu6A=";
  };

  cmakeFlags = [
    # Feel free to create a PR to add CUDA support
    "-DCCTAG_WITH_CUDA=OFF"

    "-DCCTAG_ENABLE_SIMD_AVX2=${if avx2Support then "ON" else "OFF"}"

    "-DCCTAG_BUILD_TESTS=${if doCheck then "ON" else "OFF"}"
    "-DCCTAG_BUILD_APPS=OFF"
  ];

  patches = [
    ./cmake-install-include-dir.patch
  ];

  nativeBuildInputs = [
    cmake
  ];

  propagatedBuildInputs = [
    tbb
  ];

  buildInputs = [
    boost
    eigen
    opencv
  ];

  # Tests are broken on Darwin (linking issue)
  doCheck = !stdenv.isDarwin;

  meta = with lib; {
    description = "Detection of CCTag markers made up of concentric circles";
    homepage = "https://cctag.readthedocs.io";
    downloadPage = "https://github.com/alicevision/CCTag";
    license = licenses.mpl20;
    platforms = platforms.all;
    maintainers = with maintainers; [ tmarkus ];
  };
}
+4 −0
Original line number Diff line number Diff line
@@ -19481,6 +19481,10 @@ with pkgs;
  ccrtp = callPackage ../development/libraries/ccrtp { };
  cctag = callPackage ../development/libraries/cctag {
    tbb = tbb_2021_8;
  };
  cctz = callPackage ../development/libraries/cctz {
    inherit (darwin.apple_sdk.frameworks) Foundation;
  };