Skip to content

Commit

Permalink
moved to forked libCZI
Browse files Browse the repository at this point in the history
  • Loading branch information
elhuhdron committed Aug 16, 2018
1 parent d8541f9 commit 7fd97bf
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 30 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "libCZI"]
path = libCZI
url = https://github.com/zeiss-microscopy/libCZI.git
1 change: 0 additions & 1 deletion libCZI
Submodule libCZI deleted from 0922f1
26 changes: 0 additions & 26 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 <cstdlib> // 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 = []
Expand Down

0 comments on commit 7fd97bf

Please sign in to comment.