From 7fd97bf9935b85dd0ba0feb5ee800c1d13c3b7aa Mon Sep 17 00:00:00 2001 From: Paul Watkins Date: Thu, 16 Aug 2018 11:43:36 +0200 Subject: [PATCH] moved to forked libCZI --- .gitmodules | 3 --- libCZI | 1 - setup.py | 26 -------------------------- 3 files changed, 30 deletions(-) delete mode 160000 libCZI diff --git a/.gitmodules b/.gitmodules index 8228ddc0..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "libCZI"] - path = libCZI - url = https://github.com/zeiss-microscopy/libCZI.git diff --git a/libCZI b/libCZI deleted file mode 160000 index 0922f1b1..00000000 --- a/libCZI +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0922f1b13582680b2c9801415f7368d17e8b360b diff --git a/setup.py b/setup.py index b53b7ef9..e6e7503b 100644 --- a/setup.py +++ b/setup.py @@ -39,34 +39,8 @@ lib_libCZI = os.path.join(build_temp, 'Src', 'libCZI') lib_JxrDecode = os.path.join(build_temp, 'Src', 'JxrDecode') -def append_if_not_in_file(fn, str_): - with open(fn, 'r+') as file: - for line in file: - if str_ in line: - break - else: - file.write('\n' + str_) - -def prepend_if_not_in_file(fn, str_): - with open(fn, 'r') as original: - data = original.read() - for line in iter(data.splitlines()): - if str_ in line: - break - else: - with open(fn, 'w') as modified: - modified.write(str_ + '\n' + data) def build_libCZI(): - # xxx - this is a bug for building in linux, report to libCZI issues - prepend_if_not_in_file(os.path.join(include_libCZI, 'libCZI', 'stdAllocator.cpp'), - '#include // for aligned_alloc') - if platform_ == 'Linux': - append_if_not_in_file(os.path.join(include_libCZI, 'libCZI', 'CMakeLists.txt'), - 'target_link_libraries (libCZIStatic -static-libstdc++ -Bstatic -lc)') - append_if_not_in_file(os.path.join(include_libCZI, 'JxrDecode', 'CMakeLists.txt'), - 'target_link_libraries (JxrDecodeStatic -static-libstdc++ -Bstatic -lc)') - env = os.environ.copy() cmake_args = ['-DCMAKE_BUILD_TYPE:STRING=Release'] build_args = []