Commit 6483a848 authored by Chris Cantwell's avatar Chris Cantwell

Removed debug output from finding Boost.

Removed Cannot Find Boost warnings.
Added status messages for each library found or built.
parent d49e26bc
......@@ -18,7 +18,7 @@ ENDIF (FFTW_LIB)
IF (FFTW_FOUND)
IF (NOT FFTW_LIB_FIND_QUIETLY)
MESSAGE(STATUS "Found FFTW")
MESSAGE(STATUS "Found FFTW: ${FFTW_LIB}")
GET_FILENAME_COMPONENT(FFTW_PATH ${FFTW_LIB} PATH CACHE)
SET(FFTW_INCLUDE_DIR ${FFTW_PATH}/../include CACHE FILEPATH "FFTW include directory.")
MARK_AS_ADVANCED(FFTW_PATH)
......
......@@ -86,8 +86,7 @@ IF (THIRDPARTY_BUILD_BOOST)
)
ENDIF ()
ELSE (THIRDPARTY_BUILD_BOOST)
SET(Boost_DEBUG 1)
SET(Boost_ADDITIONAL_VERSIONS "1.51" "1.51.0" "1.50" "1.50.0" "1.49" "1.49.0" "1.48" "1.48.0" "1.47.0" "1.47" "1.46" "1.46. 1" "1.40" "1.40.0" "1.35.0" "1.35")
SET(Boost_DEBUG 0)
SET(Boost_NO_BOOST_CMAKE ON)
#If the user has not set BOOST_ROOT, look in a couple common places first.
......@@ -96,19 +95,43 @@ ELSE (THIRDPARTY_BUILD_BOOST)
IF (DEFINED TEST_ENV)
SET(Boost_NO_SYSTEM_PATHS ON)
SET(BOOST_ROOT $ENV{BOOST_HOME})
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time
FIND_PACKAGE( Boost QUIET COMPONENTS thread iostreams zlib date_time
filesystem system program_options regex )
ELSE ()
SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/ThirdParty/boost)
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
FIND_PACKAGE( Boost QUIET COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/../ThirdParty/boost)
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
FIND_PACKAGE( Boost QUIET COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/ThirdParty/dist)
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
FIND_PACKAGE( Boost QUIET COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
ENDIF()
ELSE()
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
ENDIF()
IF (Boost_IOSTREAMS_FOUND)
MESSAGE(STATUS "Found Boost iostreams library: ${Boost_IOSTREAMS_LIBRARY}")
ENDIF ()
IF (Boost_THREAD_FOUND)
MESSAGE(STATUS "Found Boost thread library: ${Boost_THREAD_LIBRARY}")
ENDIF ()
IF (Boost_DATE_TIME_FOUND)
MESSAGE(STATUS "Found Boost date_time library: ${Boost_DATE_TIME_LIBRARY}")
ENDIF ()
IF (Boost_FILESYSTEM_FOUND)
MESSAGE(STATUS "Found Boost filesystem library: ${Boost_FILESYSTEM_LIBRARY}")
ENDIF ()
IF (Boost_SYSTEM_FOUND)
MESSAGE(STATUS "Found Boost system library: ${Boost_SYSTEM_LIBRARY}")
ENDIF ()
IF (Boost_PROGRAM_OPTIONS_FOUND)
MESSAGE(STATUS "Found Boost program_options library: ${Boost_PROGRAM_OPTIONS_LIBRARY}")
ENDIF ()
IF (Boost_REGEX_FOUND)
MESSAGE(STATUS "Found Boost regex library: ${Boost_REGEX_LIBRARY}")
ENDIF ()
IF (Boost_ZLIB_FOUND)
MESSAGE(STATUS "-- Found Boost zlib library: ${Boost_ZLIB_LIBRARY}")
ENDIF ()
ENDIF (THIRDPARTY_BUILD_BOOST)
INCLUDE_DIRECTORIES(SYSTEM ${Boost_INCLUDE_DIRS})
......@@ -21,6 +21,7 @@ IF( NEKTAR_USE_FFTW )
SET(FFTW_LIB fftw3)
MARK_AS_ADVANCED(FFTW_LIB)
INCLUDE_DIRECTORIES(${TPSRC}/dist/include)
MESSAGE(STATUS "Build FFTW: ${TPSRC}/dist/lib/lib${FFTW_LIB}.so")
ELSE ()
INCLUDE (FindFFTW)
INCLUDE_DIRECTORIES(${FFTW_INCLUDE_DIR})
......
......@@ -31,6 +31,8 @@ IF( NEKTAR_USE_MPI )
SET(XXT_LIBRARY xxt CACHE FILEPATH
"XXT path" FORCE)
MARK_AS_ADVANCED(XXT_LIBRARY)
MESSAGE(STATUS "Build GSMPI: ${TPSRC}/dist/lib/lib${GSMPI_LIBRARY}.a")
MESSAGE(STATUS "Build XXT: ${TPSRC}/dist/lib/lib${XXT_LIBRARY}.a")
ELSE (THIRDPARTY_BUILD_GSMPI)
INCLUDE (FindGSMPI)
INCLUDE (FindXXT)
......
......@@ -16,6 +16,7 @@ IF (THIRDPARTY_BUILD_METIS)
MARK_AS_ADVANCED(METIS_LIB)
LINK_DIRECTORIES(${TPSRC}/dist/lib)
INCLUDE_DIRECTORIES(${TPSRC}/dist/include)
MESSAGE(STATUS "Build Metis: ${TPSRC}/dist/lib/lib${METIS_LIB}.a")
ELSE (THIRDPARTY_BUILD_METIS)
INCLUDE (FindMetis)
ENDIF (THIRDPARTY_BUILD_METIS)
......
......@@ -6,4 +6,7 @@ IF( NEKTAR_USE_QT4 )
FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui REQUIRED)
INCLUDE(${QT_USE_FILE})
ADD_DEFINITIONS(${QT_DEFINITIONS})
IF (QT4_FOUND)
MESSAGE(STATUS "Found QT4: ${QT_INCLUDE_DIR}")
ENDIF(QT4_FOUND)
ENDIF( NEKTAR_USE_QT4 )
......@@ -15,6 +15,7 @@ IF (THIRDPARTY_BUILD_NIST_SPBLASTK)
"Path to NIST Sparse BLAS." FORCE)
MARK_AS_ADVANCED(NIST_SPARSE_BLAS)
LINK_DIRECTORIES(${TPSRC}/dist/lib)
MESSAGE(STATUS "Build NIST Sparse BLAS: ${TPSRC}/dist/lib/lib${NIST_SPARSE_BLAS}.a")
ELSE (THIRDPARTY_BUILD_NIST_SPBLASTK)
INCLUDE(FindNistSparseBlas)
ENDIF (THIRDPARTY_BUILD_NIST_SPBLASTK)
......
......@@ -25,9 +25,11 @@ IF( NEKTAR_USE_VTK )
INCLUDE (${VTK_DIR}/VTKConfig.cmake)
ELSE()
INCLUDE (FindVTK)
IF (NOT VTK_FOUND)
IF (VTK_FOUND)
MESSAGE(STATUS "Found VTK: ${VTK_USE_FILE}")
ELSE (VTK_FOUND)
MESSAGE(FATAL_ERROR "VTK not found")
ENDIF (NOT VTK_FOUND)
ENDIF (VTK_FOUND)
ENDIF()
INCLUDE (${VTK_USE_FILE})
......
......@@ -34,6 +34,11 @@ ELSE (THIRDPARTY_BUILD_ZLIB)
SET(Boost_ZLIB_LIBRARY_RELEASE ${ZLIB_LIBRARY})
SET(Boost_ZLIB_LIBRARY_DEBUG ${ZLIB_LIBRARY})
ENDIF()
IF (ZLIB_FOUND)
MESSAGE(STATUS "Found Zlib library: ${ZLIB_LIBRARY}")
ENDIF ()
ENDIF (THIRDPARTY_BUILD_ZLIB)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment