This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via b98f87ace9dc047af46e9efa3292302babc0afb0 (commit) via 9ee14d178b4336e9c69822044f7fb2ea725c33fd (commit) via 3be1282fd31e7f663b4fdd6a271781cceccbdbda (commit) from db18163a1dc6151d74027f3be3b12dd58971a40b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b98f87ace9dc047af46e9efa3292302babc0afb0 commit b98f87ace9dc047af46e9efa3292302babc0afb0 Merge: db18163 9ee14d1 Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Sun Jan 22 06:52:42 2012 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sun Jan 22 06:52:42 2012 -0500 Merge topic 'improve-findjasper' into next 9ee14d1 FindJasper: find debug libraries 3be1282 KWSys Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ee14d178b4336e9c69822044f7fb2ea725c33fd commit 9ee14d178b4336e9c69822044f7fb2ea725c33fd Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Sun Jan 22 11:15:24 2012 +0100 Commit: Rolf Eike Beer <e...@sf-mail.de> CommitDate: Sun Jan 22 12:51:54 2012 +0100 FindJasper: find debug libraries diff --git a/Modules/FindJasper.cmake b/Modules/FindJasper.cmake index bae4c05..1933875 100644 --- a/Modules/FindJasper.cmake +++ b/Modules/FindJasper.cmake @@ -19,19 +19,28 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) -FIND_PACKAGE(JPEG) - FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h) -FIND_LIBRARY(JASPER_LIBRARY NAMES jasper libjasper) +IF (NOT JASPER_LIBRARIES) + FIND_PACKAGE(JPEG) + + FIND_LIBRARY(JASPER_LIBRARY_RELEASE NAMES jasper libjasper) + FIND_LIBRARY(JASPER_LIBRARY_DEBUG NAMES japserd jasper libjasper) + + IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) + SET(JASPER_LIBRARIES optimized "${JASPER_LIBRARY_RELEASE}" debug "${JASPER_LIBRARY_DEBUG}") + ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) + SET(JASPER_LIBRARIES "${JASPER_LIBRARY_RELEASE}") + ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) +ENDIF (NOT JASPER_LIBRARIES) # handle the QUIETLY and REQUIRED arguments and set JASPER_FOUND to TRUE if # all listed variables are TRUE INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jasper DEFAULT_MSG JASPER_LIBRARY JASPER_INCLUDE_DIR JPEG_LIBRARIES) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jasper DEFAULT_MSG JASPER_LIBRARIES JASPER_INCLUDE_DIR JPEG_LIBRARIES) IF (JASPER_FOUND) - SET(JASPER_LIBRARIES ${JASPER_LIBRARY} ${JPEG_LIBRARIES} ) + SET(JASPER_LIBRARIES ${JASPER_LIBRARIES} ${JPEG_LIBRARIES} ) ENDIF (JASPER_FOUND) -MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARY) +MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARY_RELEASE JASPER_LIBRARY_DEBUG) ----------------------------------------------------------------------- Summary of changes: Modules/FindJasper.cmake | 21 +++++++++++++++------ Source/kwsys/kwsysDateStamp.cmake | 2 +- 2 files changed, 16 insertions(+), 7 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits