diff options
| author | Ehsan Akhgari <ehsan.akhgari@gmail.com> | 2012-02-07 22:02:28 -0500 |
|---|---|---|
| committer | Ehsan Akhgari <ehsan.akhgari@gmail.com> | 2012-02-08 18:52:18 -0500 |
| commit | d08ee4aa0bf4bd22d234819656489de020766b21 (patch) | |
| tree | 8fa91f402799244e3a3ff08a8ab2901ef9189807 | |
| parent | 4d474cf03e1d9adc4e4740965ed24b22815e7e86 (diff) | |
Fix test_openjpeg
| -rw-r--r-- | tests/openjpeg/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | tests/runner.py | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/openjpeg/CMakeLists.txt b/tests/openjpeg/CMakeLists.txt index 52150f5f..d8671fed 100644 --- a/tests/openjpeg/CMakeLists.txt +++ b/tests/openjpeg/CMakeLists.txt @@ -22,6 +22,8 @@ STRING(TOLOWER ${OPENJPEG_NAMESPACE} OPENJPEG_LIBRARY_NAME) PROJECT(${OPENJPEG_NAMESPACE} C) +include(CMakeDetermineSystem) + # Do full dependency headers. INCLUDE_REGULAR_EXPRESSION("^.*$") diff --git a/tests/runner.py b/tests/runner.py index b1b32959..960a5d21 100755 --- a/tests/runner.py +++ b/tests/runner.py @@ -4444,11 +4444,11 @@ def process(filename): shutil.copy(path_from_root('tests', 'openjpeg', 'opj_config.h'), self.get_dir()) lib = self.get_library('openjpeg', - [os.path.join('bin', self.get_shared_library_name('libopenjpeg.so.1.4.0')), - os.path.sep.join('codec/CMakeFiles/j2k_to_image.dir/index.c.o'.split('/')), + [os.path.sep.join('codec/CMakeFiles/j2k_to_image.dir/index.c.o'.split('/')), os.path.sep.join('codec/CMakeFiles/j2k_to_image.dir/convert.c.o'.split('/')), os.path.sep.join('codec/CMakeFiles/j2k_to_image.dir/__/common/color.c.o'.split('/')), - os.path.sep.join('codec/CMakeFiles/j2k_to_image.dir/__/common/getopt.c.o'.split('/'))], + os.path.sep.join('codec/CMakeFiles/j2k_to_image.dir/__/common/getopt.c.o'.split('/')), + os.path.join('bin', self.get_shared_library_name('libopenjpeg.so.1.4.0'))], configure=['cmake', '.'], #configure_args=['--enable-tiff=no', '--enable-jp3d=no', '--enable-png=no'], make_args=[]) # no -j 2, since parallel builds can fail |