diff options
author | Kitware Robot <kwrobot@kitware.com> | 2012-08-13 13:50:14 -0400 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2012-08-13 14:19:16 -0400 |
commit | 9db3116226cb99fcf54e936c833953abcde9b729 (patch) | |
tree | bd755ed9e616bbf1482a894bc7946980d81b7703 /Modules/Platform/SunOS.cmake | |
parent | 77543bde41b0e52c3959016698b529835945d62d (diff) | |
download | cmake-9db3116226cb99fcf54e936c833953abcde9b729.tar.gz |
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.
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' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
egrep -z -v 'Tests/CMakeTests/While-Endwhile-' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed
Diffstat (limited to 'Modules/Platform/SunOS.cmake')
-rw-r--r-- | Modules/Platform/SunOS.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/Platform/SunOS.cmake b/Modules/Platform/SunOS.cmake index a1fc72f209..da20f97a1d 100644 --- a/Modules/Platform/SunOS.cmake +++ b/Modules/Platform/SunOS.cmake @@ -5,23 +5,23 @@ if(CMAKE_SYSTEM MATCHES "SunOS-4.*") set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared -Wl,-r") set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-R") set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") -endif(CMAKE_SYSTEM MATCHES "SunOS-4.*") +endif() if(CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCC) set(CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") - else(CMAKE_COMPILER_IS_GNUCC) + else() # Take default rule from CMakeDefaultMakeRuleVariables.cmake. - endif(CMAKE_COMPILER_IS_GNUCC) -endif(CMAKE_COMPILER_IS_GNUCXX) + endif() +endif() include(Platform/UnixPaths) # Add the compiler's implicit link directories. if("${CMAKE_C_COMPILER_ID} ${CMAKE_CXX_COMPILER_ID}" MATCHES SunPro) list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /opt/SUNWspro/lib /opt/SUNWspro/prod/lib /usr/ccs/lib) -endif("${CMAKE_C_COMPILER_ID} ${CMAKE_CXX_COMPILER_ID}" MATCHES SunPro) +endif() # The Sun linker needs to find transitive shared library dependencies # in the -L path. |