Gabriel Petrovay has proposed merging lp:~gabipetrovay/zorba/formatting-image
into lp:zorba/image-module.
Requested reviews:
Gabriel Petrovay (gabipetrovay)
For more details, see:
https://code.launchpad.net/~gabipetrovay/zorba/formatting-image/+merge/78766
Formtting, corrected documentation, and usage of the new macro
SET_CMAKE_MODULE_PATH
--
https://code.launchpad.net/~gabipetrovay/zorba/formatting-image/+merge/78766
Your team Zorba Coders is subscribed to branch lp:zorba/image-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2011-08-10 14:05:13 +0000
+++ CMakeLists.txt 2011-10-09 17:16:24 +0000
@@ -12,26 +12,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
PROJECT (zorba_image_module)
ENABLE_TESTING ()
INCLUDE (CTest)
-IF (WIN32)
- # On Windows we use proxy modules that try to guess first the location
- # of the required third party libraries. This will search in order in:
- # 1. the path pointed by ZORBA_THIRD_PARTY_REQUIREMENTS
- # 2. the Program Files directory available on the users computer
- # 3. the PATH environment variable
- # The logic is implemented by the macros in the ProxyFindModule.cmake module.
- LIST (APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake_modules/Windows")
-ENDIF (WIN32)
-LIST (APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake_modules")
+SET_CMAKE_MODULE_PATH ()
FIND_PACKAGE (Zorba REQUIRED HINTS "${ZORBA_BUILD_DIR}")
INCLUDE ("${Zorba_USE_FILE}")
-ADD_SUBDIRECTORY("src")
+ADD_SUBDIRECTORY ("src")
-DONE_DECLARING_ZORBA_URIS()
+DONE_DECLARING_ZORBA_URIS ()
=== modified file 'cmake_modules/Windows/FindGraphviz.cmake'
--- cmake_modules/Windows/FindGraphviz.cmake 2011-08-19 00:03:49 +0000
+++ cmake_modules/Windows/FindGraphviz.cmake 2011-10-09 17:16:24 +0000
@@ -25,13 +25,17 @@
# -D GRAPHVIZ_INCLUDE="path_to_3rd_party_dir\*graphviz*\src"
# -D GRAPHVIZ_LIBRARY="path_to_3rd_party_dir\*graphviz*\bin\[Release]\graphviz.lib"
#
-# See the FindLibTidy.cmake module shipped with Zorba for more information.
+# See the FindGraphviz.cmake module shipped with Zorba for more information.
-FIND_PACKAGE_WIN32 (NAME Graphviz FOUND_VAR GRAPHVIZ_FOUND SEARCH_NAMES graphviz)
+FIND_PACKAGE_WIN32 (
+ NAME "Graphviz"
+ FOUND_VAR "GRAPHVIZ_FOUND"
+ SEARCH_NAMES "graphviz"
+)
IF (GRAPHVIZ_FOUND)
- #find the needed DLL's
+ # find the needed DLL's
FIND_PACKAGE_DLLS_WIN32 (${FOUND_LOCATION} graph.dll)
-ENDIF (GRAPHVIZ_FOUND)
\ No newline at end of file
+ENDIF (GRAPHVIZ_FOUND)
=== modified file 'cmake_modules/Windows/FindImageMagick.cmake'
--- cmake_modules/Windows/FindImageMagick.cmake 2011-10-08 15:05:46 +0000
+++ cmake_modules/Windows/FindImageMagick.cmake 2011-10-09 17:16:24 +0000
@@ -14,19 +14,20 @@
# - Try to find the ImageMagick lib on Windows
#
-# This is a proxy module that calls the FindGraphviz.cmake module. Before
-# doing that, we try to guess where Graphviz might be on the user's machine.
-# The user should provide ZORBA_THIRD_PARTY_REQUIREMENTS which is a path where
-# the Graphviz directory can be found. The Graphviz directory must have "graphviz"
-# (case insensitive) in its name.
+# This is a proxy module that calls the FindImageMagick.cmake module.
#
-# See the FindLibTidy.cmake module shipped with Zorba for more information.
+# See the FindImageMagick.cmake module shipped with Zorba for more information.
-FIND_PACKAGE_WIN32 (NAME ImageMagick FOUND_VAR ImageMagick_FOUND SEARCH_NAMES ImageMagick COMPONENTS Magick++ MagickCore MagickWand)
+FIND_PACKAGE_WIN32 (
+ NAME "ImageMagick"
+ FOUND_VAR "ImageMagick_FOUND"
+ SEARCH_NAMES "ImageMagick"
+ COMPONENTS Magick++ MagickCore MagickWand
+)
IF (ImageMagick_FOUND)
- #find the needed DLL's
+ # find the needed DLL's
FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "CORE_RL_bzlib_")
FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "CORE_RL_jbig_")
FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "CORE_RL_jp2_")
@@ -44,4 +45,4 @@
FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "X11")
-ENDIF (ImageMagick_FOUND)
\ No newline at end of file
+ENDIF (ImageMagick_FOUND)
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
