From: Rossen Apostolov Date: Mon, 6 Sep 2010 18:47:04 +0000 (+0200) Subject: A lot of CMake options are now marked as advanced since most users won't need to... X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=43f88f83e0b10553e243bc5318edbe5e7870890e;p=alexxy%2Fgromacs.git A lot of CMake options are now marked as advanced since most users won't need to modify them. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ff918450e7..a89e91d991 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.6) project(Gromacs) include(Dart) +mark_as_advanced(DART_ROOT) # PROJECT_VERSION should have the following structure: # VERSION[-dev-SUFFIX] where the VERSION can have any form and the suffix set(PROJECT_VERSION "4.5.1") @@ -79,26 +80,33 @@ option(GMX_DOUBLE "Use double precision" OFF) option(GMX_MPI "Build a parallel (message-passing) version of GROMACS" OFF) option(GMX_THREADS "Build a parallel (thread-based) version of GROMACS)" ON) option(GMX_SOFTWARE_INVSQRT "Use GROMACS software 1/sqrt" ON) +mark_as_advanced(GMX_SOFTWARE_INVSQRT) option(GMX_FAHCORE "Build a library with mdrun functionality" OFF) +mark_as_advanced(GMX_FAHCORE) option(GMX_OPENMM "Accelerated execution on GPUs through the OpenMM library" OFF) set(GMX_ACCELERATION "auto" - CACHE STRING "Accelerated kernels. Pick one of: none, SSE, BlueGene, Power6, ia64, altivec") + CACHE STRING "Accelerated kernels. Pick one of: auto, none, SSE, BlueGene, Power6, ia64, altivec") set(GMX_FFT_LIBRARY "fftw3" CACHE STRING "FFT library choices: fftw3,fftw2,mkl,fftpack[built-in]") option(GMX_DISABLE_FFTW_MEASURE "Do not optimize FFTW setups (not needed with SSE)" OFF) +mark_as_advanced(GMX_DISABLE_FFTW_MEASURE) set(GMX_QMMM_PROGRAM "none" CACHE STRING "QM package choices: none,gaussian,mopac,gamess,orca") option(GMX_BROKEN_CALLOC "Work around broken calloc()" OFF) +mark_as_advanced(GMX_BROKEN_CALLOC) option(BUILD_SHARED_LIBS "Enable shared libraries (can be problematic with MPI, Windows)" ${SHARED_LIBS_DEFAULT}) option(GMX_MPI_IN_PLACE "Enable MPI_IN_PLACE for MPIs that have it defined" ON) -option(GMX_DLOPEN "Compile with dlopen, needed to read VMD supported file formats" ON) mark_as_advanced(GMX_MPI_IN_PLACE) +option(GMX_DLOPEN "Compile with dlopen, needed to read VMD supported file formats" ON) +mark_as_advanced(GMX_DLOPEN) option(GMX_IA32_ASM "Add SSE assembly files for IA32" OFF) +mark_as_advanced(GMX_IA32_ASM) option(GMX_X86_64_ASM "Add SSE assembly files for X86_64" OFF) +mark_as_advanced(GMX_X86_64_ASM) option(USE_VERSION_H "Generate development version string/information" ON) mark_as_advanced(USE_VERSION_H) @@ -413,7 +421,7 @@ gmx_test_inline_asm_msvc_x86(GMX_X86_MSVC_INLINE_ASM) if (${GMX_ACCELERATION} STREQUAL "auto" AND NOT GMX_OPENMM) if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86|x64|x86_64|AMD64|amd64)") - set(GMX_ACCELERATION "SSE" CACHE STRING "Accelerated kernels. Pick one of: none, SSE, BlueGene, Power6, ia64, altivec" FORCE) + set(GMX_ACCELERATION "SSE" CACHE STRING "Accelerated kernels. Pick one of: auto, none, SSE, BlueGene, Power6, ia64, altivec" FORCE) if (GMX_64_BIT) set(GMX_X86_64_ASM ON CACHE BOOL "Add SSE assembly files for x86_64" FORCE) @@ -423,7 +431,7 @@ if (${GMX_ACCELERATION} STREQUAL "auto" AND NOT GMX_OPENMM) # Determine the assembler/compiler to use else() - set(GMX_ACCELERATION "none" CACHE STRING "Accelerated kernels. Pick one of: none, SSE, BlueGene, Power6, ia64, altivec" FORCE) + set(GMX_ACCELERATION "none" CACHE STRING "Accelerated kernels. Pick one of: auto, none, SSE, BlueGene, Power6, ia64, altivec" FORCE) endif() endif (${GMX_ACCELERATION} STREQUAL "auto" AND NOT GMX_OPENMM) @@ -464,9 +472,11 @@ elseif(${GMX_ACCELERATION} STREQUAL "SSE") if(CMAKE_GENERATOR MATCHES "Visual Studio") option(GMX_ASM_USEASM-NASM "Use Nasm for assembly instead of compiler (necessary on windows)" ON) - else(CMAKE_GENERATOR MATCHES "Visual Studio") + else() option(GMX_ASM_USEASM-NASM "Use Nasm for assembly instead of compiler (necessary on windows)" OFF) - endif(CMAKE_GENERATOR MATCHES "Visual Studio") + endif() + mark_as_advanced(GMX_ASM_USEASM-NASM) + if (NOT GMX_64_BIT) # for 32-bit compiles, we might need to turn on sse CHECK_C_COMPILER_FLAG("-msse2" XFLAGS_SSE) @@ -516,7 +526,7 @@ elseif(${GMX_ACCELERATION} STREQUAL "ALTIVEC") set(GMX_PPC_ALTIVEC 1) endif(HAVE_ALTIVEC_H) else(${GMX_ACCELERATION} STREQUAL "NONE") - MESSAGE(FATAL_ERROR "Unrecognized option for accelerated kernels: ${GMX_ACCELERATION}. Pick one of none, SSE, Fortran, BlueGene, Power6, ia64, altivec") + MESSAGE(FATAL_ERROR "Unrecognized option for accelerated kernels: ${GMX_ACCELERATION}. Pick one of auto, none, SSE, Fortran, BlueGene, Power6, ia64, altivec") endif(${GMX_ACCELERATION} STREQUAL "NONE") @@ -617,6 +627,8 @@ else(HAVE_MKL OR ACCELERATE_FRAMEWORK) set(GMX_EXTERNAL_BLAS FALSE CACHE BOOL "Use external LAPACK instead of built-in") set(GMX_EXTERNAL_LAPACK FALSE CACHE BOOL "Use external LAPACK instead of built-in") endif(HAVE_MKL OR ACCELERATE_FRAMEWORK) +mark_as_advanced(GMX_EXTERNAL_LAPACK) +mark_as_advanced(GMX_EXTERNAL_BLAS) # Math and thread libraries must often come after all others when linking... if(HAVE_LIBM) @@ -690,7 +702,11 @@ ADD_CUSTOM_TARGET(uninstall # Tests # ######################################################################## -enable_testing() -add_test(TestBuildAll make) +include(CTest) +mark_as_advanced(BUILD_TESTING) +IF(BUILD_TESTING) + enable_testing() + add_test(TestBuildAll make) + add_subdirectory(tests) +ENDIF() -add_subdirectory(tests)