Skip to content

Commit

Permalink
Merge pull request #216402 from hesiod/cctag
Browse files Browse the repository at this point in the history
cctag: init at 1.0.3
  • Loading branch information
davidak authored Mar 30, 2023
2 parents 5f0d203 + 3bc6ed6 commit 93feafa
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 0 deletions.
11 changes: 11 additions & 0 deletions pkgs/development/libraries/cctag/cmake-install-include-dir.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- 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 changes: 66 additions & 0 deletions pkgs/development/libraries/cctag/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{ 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 changes: 4 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down

0 comments on commit 93feafa

Please sign in to comment.