From 152c71144bcdeb3b466c1f8c0a0cc08a4d1fabba Mon Sep 17 00:00:00 2001 From: Michael Wild Date: Thu, 12 Feb 2009 09:00:06 +0100 Subject: [PATCH] Marked the CMake FF_* variables as advanced Signed-off-by: Michael Wild --- CMakeLists.txt | 15 +++++++++++---- ThirdParty/METIS/CMakeLists.txt | 3 +++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 49e0e4636..579c3470c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,12 +61,14 @@ if( APPLE ) else( APPLE ) set( FF_BUILD_FRAMEWORK OFF ) endif( APPLE ) +mark_as_advanced( FF_BUILD_FRAMEWORK ) # we want shared libraries set( BUILD_SHARED_LIBS SHARED ) # use a prefix for executables set (EXECUTABLE_PREFIX "ff_" CACHE STRING "Prefix prepended to all program and script names") +mark_as_advanced( EXECUTABLE_PREFIX ) # installation directories set( FF_INSTALL_BIN_PATH bin CACHE STRING "Executables installation path (absolute or relative to CMAKE_INSTALL_PREFIX)" ) @@ -82,6 +84,8 @@ set( FF_INSTALL_DOC_PATH share/doc/${CMAKE_PROJECT_NAME}/${FF_VERSION} CACHE STR set( FF_INSTALL_PVFOAMREADER_PATH lib/${CMAKE_PROJECT_NAME}/${FF_VERSION}/plugins/PVFoamReader CACHE STRING "ParaView2 OpenFOAM-reader plugin installation path" ) set( FF_INSTALL_PV3FOAMREADER_PATH lib/${CMAKE_PROJECT_NAME}/${FF_VERSION}/plugins/PV3FoamReader CACHE STRING "ParaView3 OpenFOAM-reader plugin installation path" ) set( FF_INSTALL_USERDFOAM_PATH lib/${CMAKE_PROJECT_NAME}/${FF_VERSION}/plugins/userd-foam CACHE STRING "Ensight OpenFOAM-reader plugin installation path" ) +mark_as_advanced( FF_INSTALL_BIN_PATH FF_INSTALL_LIB_PATH FF_INSTALL_HEADER_PATH FF_INSTALL_CONFIG_PATH FF_INSTALL_DATA_PATH + FF_INSTALL_DOC_PATH FF_INSTALL_PVFOAMREADER_PATH FF_INSTALL_PV3FOAMREADER_PATH FF_INSTALL_USERDFOAM_PATH ) # make absolute paths foreach( _p FF_INSTALL_BIN_PATH FF_INSTALL_LIB_PATH FF_INSTALL_HEADER_PATH @@ -110,10 +114,8 @@ mark_as_advanced( HTML_DOC_BROWSER FF_HTML_DOC_BROWSER_COMMAND ) set( CMAKE_INSTALL_RPATH ${FF_INSTALL_LIB_PATH} ) # we want executables and libraries in one place -set( EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE PATH - "Single output directory for building all executables." ) -set( LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib/FreeFOAM/${FF_VERSION} CACHE PATH - "Single output directory for building all libraries." ) +set( EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin ) +set( LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib/FreeFOAM/${FF_VERSION} ) # determine computer system include( FFDetermineArch ) @@ -136,6 +138,7 @@ endif( CMAKE_SYSTEM_NAME STREQUAL Linux ) if( MPI_FOUND OR PVM_FOUND OR GAMMA_FOUND ) set( FF_USE_PARALLEL TRUE ) endif( MPI_FOUND OR PVM_FOUND OR GAMMA_FOUND ) +mark_as_advanced( FF_USE_MPI FF_USE_PVM FF_USE_GAMMA ) # find flex find_package( FLEX REQUIRED ) @@ -207,6 +210,9 @@ else( FF_BUILD_PRIVATE_CCMIO ) endif( NOT CCMIO_FOUND ) endif( FF_BUILD_PRIVATE_CCMIO ) +mark_as_advanced( FF_BUILD_PRIVATE_CCMIO FF_BUILD_PRIVATE_METIS FF_BUILD_PRIVATE_PARMETIS + FF_BUILD_PRIVATE_PARMGRIDGEN FF_DOUBLE_PRECISION ) + # ask user whether she wants to build ParaView plugins option( FF_BUILD_PARAVIEW_PLUGINS "Build the ParaView plugins. Requires a ParaView build tree." ON ) if( FF_BUILD_PARAVIEW_PLUGINS ) @@ -245,6 +251,7 @@ option( FF_ENABLE_DOXYGEN_DOCS "Build the Doxygen documentation" OFF ) if( FF_ENABLE_DOXYGEN_DOCS ) find_package( Doxygen REQUIRED ) endif( FF_ENABLE_DOXYGEN_DOCS ) +mark_as_advanced( FF_ENABLE_DOXYGEN_DOCS ) # set up defines add_definitions( diff --git a/ThirdParty/METIS/CMakeLists.txt b/ThirdParty/METIS/CMakeLists.txt index a0be8c17b..48fe51d49 100644 --- a/ThirdParty/METIS/CMakeLists.txt +++ b/ThirdParty/METIS/CMakeLists.txt @@ -82,11 +82,14 @@ else( METIS_HAVE_THREADLOCAL_STORAGE ) endif( METIS_HAVE_THREADLOCAL_STORAGE ) mark_as_advanced( + METIS_INCLUDE_DIR METIS_INCLUDE_PATH METIS_metis_LIABRARY METIS_GKlib_LIBRARY METIS_LIBRARIES METIS_HAVE_THREADLOCAL_STORAGE + METIS_LINK_FLAGS + METIS_COMPILE_FLAGS ) # custom command to patch metis for threadlocal storage -- 2.11.4.GIT