Commit 76799a66 authored by Dave Moxey's avatar Dave Moxey

Fix zlib command line override

parent a83bfe20
########################################################################
#
# ThirdParty configuration for Nektar++
#
# Boost
#
########################################################################
OPTION(THIRDPARTY_BUILD_BOOST "Build Boost libraries" OFF)
SET(Boost_USE_MULTITHREADED ON CACHE BOOL
"Search for multithreaded boost libraries")
......
......@@ -6,10 +6,12 @@
#
########################################################################
# Attempt to identify Macports libraries, if they exist. This prevents
# cmake warnings later on.
SET(ZLIB_ROOT /opt/local/)
# Attempt to identify Macports libraries, if they exist and we didn't override
# ZLIB_ROOT on the command line or in ccmake. This prevents cmake warnings later
# on.
IF (NOT DEFINED ZLIB_ROOT)
SET(ZLIB_ROOT /opt/local/)
ENDIF()
# Find a system ZLIB library
# If not found enable the THIRDPARTY_BUILD_ZLIB option
......@@ -24,7 +26,6 @@ ELSE ()
OPTION(THIRDPARTY_BUILD_ZLIB "Build ZLib library" ON)
ENDIF()
# If we or the user
IF (THIRDPARTY_BUILD_ZLIB)
MESSAGE(STATUS "Will build Zlib 1.2.7")
......
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