Commit 8fb092bc authored by bonnell's avatar bonnell
Browse files

Remove setting default build_type using VISIT_OPTION_DEFAULT, as it forces the...

Remove setting default build_type using VISIT_OPTION_DEFAULT, as it forces the default, not allowing changes via command-line or by editing CMakeCache.txt.  Use SET command in root CMakeLists.txt only if build type has not already been set.  Update host config-site files accordingly.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@14016 18c085ea-50e0-402c-830e-de6fd14e8384
parent ff522796
......@@ -221,6 +221,9 @@
# Kathleen Bonnell, Mon Feb 14 11:09:17 MST 2011
# Remove strerror test, HAVE_STRERROR no longer used in VisIt.
#
# Kathleen Bonnell, Wed Feb 16 08:33:33 PST 2011
# Set CMAKE_BUILD_TYPE to Release, if not already set.
#
#****************************************************************************/
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
......@@ -354,6 +357,15 @@ IF (WIN32)
MESSAGE(STATUS "VISIT_WIN_ICON_RESOURCE = ${VISIT_WIN_ICON_RESOURCE}")
ENDIF (WIN32)
#-----------------------------------------------------------------------------
# If not already set, we use a default build type of Release
#-----------------------------------------------------------------------------
IF (NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build,
options are: Debug Release RelWithDebInfo MinSizeRel.")
ENDIF()
#-----------------------------------------------------------------------------
# Output directories.
#-----------------------------------------------------------------------------
......
......@@ -44,7 +44,6 @@ VISIT_OPTION_DEFAULT(VISIT_ICET_DIR ${VISITHOME}/icet/1.0.0/${VISITARCH})
##
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++)
VISIT_OPTION_DEFAULT(CMAKE_BUILD_TYPE Release)
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS " -Wno-deprecated -m64 -fPIC -fvisibility=hidden")
VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -Wno-deprecated -m64 -fPIC -fvisibility=hidden")
......
......@@ -37,7 +37,7 @@ VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/2.6.4/${VISITARCH})
## Compiler flags.
##
SET(CMAKE_BUILD_TYPE Debug)
SET(CMAKE_BUILD_TYPE Debug CACHE STRING "")
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++)
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS "-fvisibility=hidden")
......
......@@ -37,7 +37,6 @@ VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/2.6.4/${VISITARCH})
##
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++)
VISIT_OPTION_DEFAULT(CMAKE_BUILD_TYPE Release)
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS "")
VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS "")
......
......@@ -41,7 +41,6 @@ VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/2.6.4/${VISITARCH})
##
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++)
VISIT_OPTION_DEFAULT(CMAKE_BUILD_TYPE Release)
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS " -m64 -fPIC -fvisibility=hidden")
VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -m64 -fPIC -fvisibility=hidden")
......
......@@ -14,7 +14,6 @@ SET(VISITARCH linux-x86_64_gcc-4.4)
SET(VISIT_VERBOSE_MAKEFILE TRUE)
VISIT_OPTION_DEFAULT(CMAKE_INSTALL_PREFIX /usr/common/graphics/visit)
VISIT_OPTION_DEFAULT(VISIT_INSTALL_THIRD_PARTY ON)
VISIT_OPTION_DEFAULT(CMAKE_BUILD_TYPE Release)
##
## Do not build Tuvok
......
......@@ -12,7 +12,7 @@ SET(VISITHOME /Users/ghweber/devel/visit_3rdparty)
SET(VISITARCH i386-apple-darwin10_gcc-4.2)
SET(VISIT_VERBOSE_MAKEFILE TRUE)
VISIT_OPTION_DEFAULT(CMAKE_INSTALL_PREFIX /usr/local/visit)
VISIT_OPTION_DEFAULT(CMAKE_BUILD_TYPE Debug)
SET(CMAKE_BUILD_TYPE Debug CACHE STRING "")
VISIT_OPTION_DEFAULT(VISIT_PYTHON_FILTERS ON)
##
......
......@@ -12,7 +12,6 @@ SET(VISITHOME /scratch/build/visit_3rdparty)
SET(VISITARCH i386-apple-darwin9_gcc-4.0)
SET(VISIT_VERBOSE_MAKEFILE TRUE)
VISIT_OPTION_DEFAULT(CMAKE_INSTALL_PREFIX /usr/local/visit)
VISIT_OPTION_DEFAULT(CMAKE_BUILD_TYPE Release)
##
## Specify the location of the mesa.
......
......@@ -13,7 +13,6 @@ SET(VISITARCH linux-x86_64_gcc-4.3)
SET(VISIT_VERBOSE_MAKEFILE TRUE)
VISIT_OPTION_DEFAULT(CMAKE_INSTALL_PREFIX /usr/local/anag/pkg/VisIt-2.0.0b)
VISIT_OPTION_DEFAULT(VISIT_INSTALL_THIRD_PARTY ON)
VISIT_OPTION_DEFAULT(CMAKE_BUILD_TYPE Release)
VISIT_OPTION_DEFAULT(VISIT_RPATH_RELATIVE_TO_EXECUTABLE_PATH ON)
# FIXME: Python filters break static MPI. Long term, install shared library MPI version.
......
......@@ -37,7 +37,6 @@ VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/2.6.4/${VISITARCH})
##
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++)
VISIT_OPTION_DEFAULT(CMAKE_BUILD_TYPE Release)
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS " -fvisibility=hidden")
VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -fvisibility=hidden")
......
......@@ -13,7 +13,6 @@ SET(VISITHOME /usr/common/graphics/installs/visit_3rdparty)
SET(VISITARCH linux-x86_64_gcc-4.3)
SET(VISIT_VERBOSE_MAKEFILE TRUE)
VISIT_OPTION_DEFAULT(CMAKE_INSTALL_PREFIX /usr/common/graphics/visit)
VISIT_OPTION_DEFAULT(CMAKE_BUILD_TYPE Release)
##
## Do not build Tuvok
......
......@@ -41,7 +41,6 @@ VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/2.6.4/${VISITARCH})
##
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++)
VISIT_OPTION_DEFAULT(CMAKE_BUILD_TYPE Release)
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS "")
VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS "")
......
......@@ -37,7 +37,6 @@ VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/2.6.4/${VISITARCH})
##
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++)
VISIT_OPTION_DEFAULT(CMAKE_BUILD_TYPE Release)
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS " -Wno-deprecated -m64 -fPIC -fvisibility=hidden")
VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -Wno-deprecated -m64 -fPIC -fvisibility=hidden")
......
......@@ -13,7 +13,6 @@ SET(VISITARCH linux-x86_64_gcc-4.2)
SET(VISIT_VERBOSE_MAKEFILE TRUE)
VISIT_OPTION_DEFAULT(VISIT_PARALLEL ON)
VISIT_OPTION_DEFAULT(CMAKE_INSTALL_PREFIX /sw/analysis-x64/visit)
VISIT_OPTION_DEFAULT(CMAKE_BUILD_TYPE Release)
......
......@@ -37,7 +37,6 @@ VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/2.6.4/${VISITARCH})
##
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++ TYPE STRING)
VISIT_OPTION_DEFAULT(CMAKE_BUILD_TYPE Release TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS " -m64 -fPIC -fvisibility=hidden" TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -m64 -fPIC -fvisibility=hidden" TYPE STRING)
SET(VISIT_VERBOSE_MAKEFILE TRUE)
......
......@@ -12,7 +12,7 @@ SET(VISITHOME /apps/visit)
SET(VISITARCH i386-apple-darwin10_gcc-4.2)
SET(VISIT_VERBOSE_MAKEFILE TRUE)
SET(CMAKE_INSTALL_PREFIX /apps/visit)
VISIT_OPTION_DEFAULT(CMAKE_BUILD_TYPE Debug)
SET(CMAKE_BUILD_TYPE Debug CACHE STRING "")
##
## Specify the location of the mesa.
......
......@@ -12,7 +12,7 @@ SET(VISITHOME /apps/visit)
SET(VISITARCH linux-x86_64_gcc-3.4)
SET(VISIT_VERBOSE_MAKEFILE TRUE)
SET(CMAKE_INSTALL_PREFIX /apps/visit)
VISIT_OPTION_DEFAULT(CMAKE_BUILD_TYPE Debug TYPE STRING)
SET(CMAKE_BUILD_TYPE Debug CACHE STRING "")
##
## Specify the location of the mesa.
......
......@@ -12,7 +12,7 @@ SET(VISITHOME /apps/visit)
SET(VISITARCH linux-x86_64_gcc-4.2)
SET(VISIT_VERBOSE_MAKEFILE TRUE)
SET(CMAKE_INSTALL_PREFIX /apps/visit)
VISIT_OPTION_DEFAULT(CMAKE_BUILD_TYPE Debug)
SET(CMAKE_BUILD_TYPE Debug CACHE STRING "")
##
## Specify the location of the mesa.
......
......@@ -37,7 +37,6 @@ VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/2.6.4/${VISITARCH})
##
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++)
VISIT_OPTION_DEFAULT(CMAKE_BUILD_TYPE Release)
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS " -m64 -fPIC -fvisibility=hidden")
VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -m64 -fPIC -fvisibility=hidden")
......
......@@ -8226,6 +8226,9 @@ function build_mdsplus
# Mark C. Miller, Wed Oct 27 19:29:19 PDT 2010 #
# Adjusted ordering of database lib variables to ensure LIBDEP gets processed #
# correctly. Added comments to host conf file regarding ordering issue. #
# #
# Kathleen Bonnell, Wed Feb 16 08:35:40 PST 2011 #
# Remove setting of CMAKE_BUILD_TYPE #
# *************************************************************************** #
function build_hostconf
......@@ -8299,7 +8302,6 @@ function build_hostconf
echo "##" >> $HOSTCONF
echo "VISIT_OPTION_DEFAULT(VISIT_C_COMPILER $C_COMPILER TYPE STRING)">> $HOSTCONF
echo "VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER $CXX_COMPILER TYPE STRING)" >> $HOSTCONF
echo "VISIT_OPTION_DEFAULT(CMAKE_BUILD_TYPE Release TYPE STRING)" >> $HOSTCONF
if [[ "$USE_VISIBILITY_HIDDEN" == "yes" ]] ; then
echo "VISIT_OPTION_DEFAULT(VISIT_C_FLAGS \"$CFLAGS -fvisibility=hidden\" TYPE STRING)" >> $HOSTCONF
......
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