From b82b47e3299948a7d489e20659c960f331ba72de Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 6 Aug 2007 11:02:58 -0400 Subject: STYLE: use FIND_PACKAGE_HANDLE_STANDARD_ARGS() also in FindMPI.cmake -remove unnecessary ELSE() in FindThreads.cmake Alex --- Modules/FindMPI.cmake | 6 ++++++ Modules/FindThreads.cmake | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake index 477fa6b..716df50 100644 --- a/Modules/FindMPI.cmake +++ b/Modules/FindMPI.cmake @@ -34,4 +34,10 @@ IF("${MPI_LIBRARY}" MATCHES "mpich.rts") SET(MPI_EXTRA_LIBRARY msglayer.rts devices.rts rts.rts devices.rts CACHE STRING "Additional MPI libs" FORCE) ENDIF("${MPI_LIBRARY}" MATCHES "mpich.rts") +INCLUDE(FindPackageHandleStandardArgs) + +# handle the QUIETLY and REQUIRED arguments and set LIBXML2_FOUND to TRUE if +# all listed variables are TRUE +FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPI DEFAULT_MSG MPI_LIBRARY MPI_INCLUDE_PATH) + MARK_AS_ADVANCED(MPI_INCLUDE_PATH MPI_LIBRARY MPI_EXTRA_LIBRARY) diff --git a/Modules/FindThreads.cmake b/Modules/FindThreads.cmake index ea4f576..904f28c 100644 --- a/Modules/FindThreads.cmake +++ b/Modules/FindThreads.cmake @@ -74,7 +74,6 @@ ELSE(CMAKE_HAVE_SPROC_H) ENDIF("THREADS_HAVE_PTHREAD_ARG" MATCHES "^THREADS_HAVE_PTHREAD_ARG") IF(THREADS_HAVE_PTHREAD_ARG) SET(CMAKE_THREAD_LIBS_INIT "-pthread") - ELSE(THREADS_HAVE_PTHREAD_ARG) ENDIF(THREADS_HAVE_PTHREAD_ARG) ENDIF(NOT CMAKE_HAVE_THREADS_LIBRARY) ENDIF(CMAKE_HAVE_PTHREAD_H) -- cgit v0.12