diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-02-16 01:43:40 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-02-16 01:43:40 (GMT) |
| commit | c7f855b130323964636ea34e1d0e8ddbeb91fb81 (patch) | |
| tree | bc0f07892481ac0554473b4d5772a1ea67b7368b /tests | |
| parent | 61a4fc30317717769240602095af531a7e297fa2 (diff) | |
| parent | f4c866086462f172063c2adca6d840c92cc79b98 (diff) | |
Merge branch 'issue11_2' of github.com:openscad/openscad into issue11_2
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3f70b02..0506045 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -372,7 +372,9 @@ inclusion(CGAL_DIR CGAL_INCLUDE_DIRS) # Imagemagick -if (NOT SKIP_IMAGEMAGICK) +if (SKIP_IMAGEMAGICK) + set(ImageMagick_convert_EXECUTABLE "echo") +else() find_package(ImageMagick COMPONENTS convert) if (ImageMagick_convert_FOUND) message(STATUS "ImageMagick convert executable found: " ${ImageMagick_convert_EXECUTABLE}) |