diff options
author | Hans Johnson <hans-johnson@uiowa.edu> | 2016-07-10 14:38:44 -0500 |
---|---|---|
committer | Hans Johnson <hans-johnson@uiowa.edu> | 2016-07-10 14:38:48 -0500 |
commit | 5333ddd9dc0fe7a54563fab4536b4a882605c02a (patch) | |
tree | 593aa7d8c899b127d6bb38bfb57b163ca63a63f2 /lapack_build.cmake | |
parent | b1e0d47edc106af8f1f0b9290785ced77c0ed1d0 (diff) | |
download | lapack-5333ddd9dc0fe7a54563fab4536b4a882605c02a.tar.gz lapack-5333ddd9dc0fe7a54563fab4536b4a882605c02a.tar.bz2 lapack-5333ddd9dc0fe7a54563fab4536b4a882605c02a.zip |
Remove CMake-language block-end command arguments
Ancient versions of CMake required else(), endif(), and similar block
termination commands to have arguments matching the command starting the
block. This is no longer the preferred style.
NOTE: MUST USE GNU compliant version of sed
Run the following shell code:
for c in else endif endforeach endfunction endmacro endwhile; do
echo 's/\b'"$c"'\(\s*\)(.\+)/'"$c"'\1()/'
done >convert.sed \
&& git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' \
| xargs -0 gsed -i -f convert.sed \
&& rm convert.sed
Diffstat (limited to 'lapack_build.cmake')
-rw-r--r-- | lapack_build.cmake | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/lapack_build.cmake b/lapack_build.cmake index 404ebd74..a9012b3b 100644 --- a/lapack_build.cmake +++ b/lapack_build.cmake @@ -5,14 +5,14 @@ cmake_minimum_required(VERSION 2.8.7) if(UNIX) if(NOT compiler) set(compiler gcc) - endif(NOT compiler) + endif() if(NOT c_compiler) set(c_compiler gcc) - endif(NOT c_compiler) + endif() if(NOT full_compiler) set(full_compiler g++) - endif(NOT full_compiler) -endif(UNIX) + endif() +endif() if(EXISTS "/proc/cpuinfo") set(parallel 1) @@ -21,7 +21,7 @@ if(EXISTS "/proc/cpuinfo") if("${line}" MATCHES processor) math(EXPR parallel "${parallel} + 1") endif() - endforeach(line) + endforeach() endif() if(WIN32) @@ -57,7 +57,7 @@ if(WIN32) set(CTEST_CMAKE_GENERATOR "${GENERATOR}") message("${CTEST_CMAKE_GENERATOR} - found") set(compiler cl) -endif(WIN32) +endif() find_program(HOSTNAME NAMES hostname) find_program(UNAME NAMES uname) @@ -70,7 +70,7 @@ message("HOSTNAME: ${hostname}") # default to parallel 1 if(NOT DEFINED parallel) set(parallel 1) -endif(NOT DEFINED parallel) +endif() # find CVS find_program(SVN svn PATHS $ENV{HOME}/bin /vol/local/bin) @@ -83,7 +83,7 @@ macro(getuname name flag) exec_program("${UNAME}" ARGS "${flag}" OUTPUT_VARIABLE "${name}") string(REGEX REPLACE "[/\\\\+<> #]" "-" "${name}" "${${name}}") string(REGEX REPLACE "^(......|.....|....|...|..|.).*" "\\1" "${name}" "${${name}}") -endmacro(getuname) +endmacro() getuname(osname -s) getuname(osver -v) @@ -97,12 +97,12 @@ if("${osname}" MATCHES Darwin) set(osrel "") if("${cpu}" MATCHES "Power") set(cpu "ppc") - endif("${cpu}" MATCHES "Power") -endif("${osname}" MATCHES Darwin) + endif() +endif() if(NOT compiler) message(FATAL_ERROR "compiler must be set") -endif(NOT compiler) +endif() set(BUILDNAME "${osname}${osver}${osrel}${cpu}-${compiler}") @@ -116,9 +116,9 @@ set (CTEST_DIR_NAME "${CTEST_MODULE_NAME}SVN") message("NOSPACES = ${NOSPACES}") if(NOSPACES) set(CTEST_DASHBOARD_ROOT "$ENV{HOME}/Dashboards/MyTests-${BUILDNAME}") -else(NOSPACES) +else() set(CTEST_DASHBOARD_ROOT "$ENV{HOME}/Dashboards/My Tests-${BUILDNAME}") -endif(NOSPACES) +endif() set(CTEST_SITE "${hostname}") set(CTEST_BUILD_NAME "${BUILDNAME}") set(CTEST_TEST_TIMEOUT "36000") @@ -127,12 +127,12 @@ set(CTEST_TEST_TIMEOUT "36000") if(NOT EXISTS "${CTEST_DASHBOARD_ROOT}/${CTEST_DIR_NAME}") set(CTEST_CHECKOUT_COMMAND "\"${CTEST_UPDATE_COMMAND}\" co https://icl.cs.utk.edu/svn/lapack-dev/lapack/trunk ${CTEST_DIR_NAME}") -endif(NOT EXISTS "${CTEST_DASHBOARD_ROOT}/${CTEST_DIR_NAME}") +endif() # Set the generator and build configuration if(NOT DEFINED CTEST_CMAKE_GENERATOR) set(CTEST_CMAKE_GENERATOR "Unix Makefiles") -endif(NOT DEFINED CTEST_CMAKE_GENERATOR) +endif() set(CTEST_PROJECT_NAME "LAPACK") set(CTEST_BUILD_CONFIGURATION "Release") @@ -142,7 +142,7 @@ if(CTEST_CMAKE_GENERATOR MATCHES Makefiles) set(ENV{CC} "${c_compiler}") set(ENV{FC} "${f_compiler}") set(ENV{CXX} "${full_compiler}") -endif(CTEST_CMAKE_GENERATOR MATCHES Makefiles) +endif() #---------------------------------------------------------------------------------- # Should not need to edit under this line @@ -164,12 +164,12 @@ set(CTEST_NOTES_FILES "${CTEST_NOTES_FILES}" if(parallel GREATER 10) if(NOT CTEST_BUILD_COMMAND) set(CTEST_BUILD_COMMAND "make -j${parallel} -i") - endif(NOT CTEST_BUILD_COMMAND) + endif() message("Use parallel build") message("CTEST_BUILD_COMMAND: ${CTEST_BUILD_COMMAND}") message("CTEST_CONFIGURE_COMMAND: ${CTEST_CONFIGURE_COMMAND}") -endif(parallel GREATER 10) +endif() ################################################################### # Values for the cmake build |