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 f3c7e58f5594d8eeab3d15f2aa5065f1cd47e64c (commit) via 349c648db19101aa06f34a989aaae74c1e858aef (commit) from 42dd02e12064aa642ce83aa02c3c0d8a0cd4424b (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=f3c7e58f5594d8eeab3d15f2aa5065f1cd47e64c commit f3c7e58f5594d8eeab3d15f2aa5065f1cd47e64c Merge: 42dd02e 349c648 Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Tue Jan 24 13:07:33 2012 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Jan 24 13:07:33 2012 -0500 Merge topic 'improve-findjasper' into next 349c648 FindJasper: use SelectLibraryConfigurations http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=349c648db19101aa06f34a989aaae74c1e858aef commit 349c648db19101aa06f34a989aaae74c1e858aef Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Tue Jan 24 17:40:43 2012 +0100 Commit: Rolf Eike Beer <e...@sf-mail.de> CommitDate: Tue Jan 24 19:07:01 2012 +0100 FindJasper: use SelectLibraryConfigurations diff --git a/Modules/FindJasper.cmake b/Modules/FindJasper.cmake index 0de5af5..48e2736 100644 --- a/Modules/FindJasper.cmake +++ b/Modules/FindJasper.cmake @@ -27,13 +27,10 @@ IF (NOT JASPER_LIBRARIES) FIND_PACKAGE(JPEG) FIND_LIBRARY(JASPER_LIBRARY_RELEASE NAMES jasper libjasper) - FIND_LIBRARY(JASPER_LIBRARY_DEBUG NAMES japserd jasper libjasper) + FIND_LIBRARY(JASPER_LIBRARY_DEBUG NAMES japserd) - 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) + INCLUDE(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) + SELECT_LIBRARY_CONFIGURATIONS(JASPER) ENDIF (NOT JASPER_LIBRARIES) IF (JASPER_INCLUDE_DIR AND EXISTS "${JASPER_INCLUDE_DIR}/jasper/jas_config.h") @@ -53,4 +50,4 @@ IF (JASPER_FOUND) SET(JASPER_LIBRARIES ${JASPER_LIBRARIES} ${JPEG_LIBRARIES} ) ENDIF (JASPER_FOUND) -MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARY_RELEASE JASPER_LIBRARY_DEBUG) +MARK_AS_ADVANCED(JASPER_INCLUDE_DIR) ----------------------------------------------------------------------- Summary of changes: Modules/FindJasper.cmake | 11 ++++------- 1 files changed, 4 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