mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-06 14:19:59 -05:00
Merge topic 'remove-trailing-blank-lines'
99ac59d31b style: Remove trailing blank lines from all CMake sources
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10026
This commit is contained in:
@@ -73,4 +73,3 @@ CMAKE_USE_WIN32_THREADS
|
||||
CMAKE_X_CFLAGS
|
||||
CMAKE_X_LIBS
|
||||
)
|
||||
|
||||
|
||||
@@ -46,4 +46,3 @@ if(NOT CMAKE_SKIP_COMPATIBILITY_TESTS)
|
||||
include(TestForSSTREAM)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_SAVE}")
|
||||
endif()
|
||||
|
||||
|
||||
@@ -17,4 +17,3 @@ include(CMakeDetermineSystem)
|
||||
# Also load the system specific file, which sets up e.g. the search paths.
|
||||
# This makes the FIND_XXX() calls work much better
|
||||
include(CMakeSystemSpecificInformation)
|
||||
|
||||
|
||||
@@ -141,4 +141,3 @@ endif()
|
||||
#
|
||||
# End of Dart.cmake
|
||||
#
|
||||
|
||||
|
||||
@@ -107,5 +107,3 @@ if (NOT "${file_text}" STREQUAL "")
|
||||
else()
|
||||
# message("FOUND NO DEPENDS")
|
||||
endif()
|
||||
|
||||
|
||||
|
||||
@@ -1343,4 +1343,3 @@ set (QT_UIC_EXE ${QT_UIC_EXECUTABLE} )
|
||||
set( QT_QT_LIBRARY "")
|
||||
set(QT4_FOUND ${Qt4_FOUND})
|
||||
set(QT_FOUND ${Qt4_FOUND})
|
||||
|
||||
|
||||
@@ -4,4 +4,3 @@
|
||||
|
||||
# work around an old bug in ITK prior to version 3.0
|
||||
set(TIFF_RIGHT_VERSION 1)
|
||||
|
||||
|
||||
@@ -399,5 +399,3 @@ macro(KDE3_ADD_EXECUTABLE _target_NAME )
|
||||
# endif ()
|
||||
|
||||
endmacro()
|
||||
|
||||
|
||||
|
||||
@@ -1,2 +1 @@
|
||||
include(Platform/UnixPaths)
|
||||
|
||||
|
||||
@@ -4,4 +4,3 @@ set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS asm)
|
||||
set(CMAKE_ASM_OUTPUT_EXTENSION ".doj" )
|
||||
set(CMAKE_ASM_COMPILE_OBJECT
|
||||
"<CMAKE_ASM_COMPILER> <INCLUDES> <FLAGS> -proc ${ADSP_PROCESSOR} -si-revision ${ADSP_PROCESSOR_SILICIUM_REVISION} -o <OBJECT> <SOURCE>")
|
||||
|
||||
|
||||
@@ -44,4 +44,3 @@ foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
|
||||
set(CMAKE_${type}_LINK_DYNAMIC_${lang}_FLAGS "-Wl,-a,default")
|
||||
endforeach()
|
||||
endforeach()
|
||||
|
||||
|
||||
@@ -10,5 +10,3 @@ else()
|
||||
endif()
|
||||
|
||||
include(Platform/UnixPaths)
|
||||
|
||||
|
||||
|
||||
@@ -1,2 +1 @@
|
||||
include(Platform/UnixPaths)
|
||||
|
||||
|
||||
@@ -43,4 +43,3 @@ include(Platform/WindowsPaths)
|
||||
#set(CMAKE_START_TEMP_FILE "")
|
||||
#set(CMAKE_END_TEMP_FILE "")
|
||||
#set(CMAKE_VERBOSE_MAKEFILE 1)
|
||||
|
||||
|
||||
@@ -1,2 +1 @@
|
||||
include(Platform/UnixPaths)
|
||||
|
||||
|
||||
@@ -62,4 +62,3 @@ set(CMAKE_CXX_LINK_SHARED_LIBRARY )
|
||||
set(CMAKE_CXX_LINK_MODULE_LIBRARY )
|
||||
set(CMAKE_C_LINK_SHARED_LIBRARY )
|
||||
set(CMAKE_C_LINK_MODULE_LIBRARY )
|
||||
|
||||
|
||||
@@ -16,4 +16,3 @@ set(CMAKE_ASM${ASM_DIALECT}_LINK_EXECUTABLE
|
||||
# to be done
|
||||
set(CMAKE_ASM${ASM_DIALECT}_CREATE_SHARED_LIBRARY)
|
||||
set(CMAKE_ASM${ASM_DIALECT}_CREATE_SHARED_MODULE)
|
||||
|
||||
|
||||
@@ -287,4 +287,3 @@ if(Q_WS_MAC)
|
||||
|
||||
set(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} "-framework ApplicationServices")
|
||||
endif()
|
||||
|
||||
|
||||
@@ -88,4 +88,3 @@ DUMP_FILE("../CMakeFiles/CMakeSystem.cmake")
|
||||
foreach (EXTRA_FILE ${EXTRA_DUMP_FILES})
|
||||
DUMP_FILE("${EXTRA_FILE}")
|
||||
endforeach ()
|
||||
|
||||
|
||||
@@ -30,8 +30,3 @@ if(NOT DEFINED CMAKE_ANSI_FOR_SCOPE)
|
||||
"Does the compiler support ansi for scope.")
|
||||
endif ()
|
||||
endif()
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -29,5 +29,3 @@ if(NOT CMAKE_NO_ANSI_STREAM_HEADERS)
|
||||
|
||||
mark_as_advanced(CMAKE_NO_ANSI_STREAM_HEADERS)
|
||||
endif()
|
||||
|
||||
|
||||
|
||||
@@ -29,7 +29,3 @@ if(NOT DEFINED CMAKE_HAS_ANSI_STRING_STREAM)
|
||||
"Does the compiler support sstream")
|
||||
endif ()
|
||||
endif()
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -29,7 +29,3 @@ if(NOT DEFINED CMAKE_STD_NAMESPACE)
|
||||
"Does the compiler support std::.")
|
||||
endif ()
|
||||
endif()
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -243,4 +243,3 @@ macro(ECOS_ADD_EXECUTABLE _exe_NAME )
|
||||
COMMAND ${ECOS_ARCH_PREFIX}objdump -S -x -d -C ${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.elf >> ${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.lst )
|
||||
|
||||
endmacro()
|
||||
|
||||
|
||||
@@ -43,4 +43,3 @@ set(TIFF_RIGHT_VERSION 1)
|
||||
macro(SOURCE_FILES)
|
||||
message (FATAL_ERROR "You are trying to build a very old version of VTK (prior to VTK 4.2). To do this you need to use CMake 2.0 as it was the last version of CMake to support VTK 4.0.")
|
||||
endmacro()
|
||||
|
||||
|
||||
@@ -19,4 +19,3 @@ string(REGEX REPLACE "tr2i18n\\(\"\", \"\"\\)" "QString::null" _uic_CONTENTS "${
|
||||
|
||||
file(WRITE ${KDE_UIC_CPP_FILE} "#include <kdialog.h>\n#include <klocale.h>\n\n")
|
||||
file(APPEND ${KDE_UIC_CPP_FILE} "${_uic_CONTENTS}")
|
||||
|
||||
|
||||
@@ -11,5 +11,3 @@ if(CMAKE_PACKAGE_QTGUI)
|
||||
set(CPACK_SET_DESTDIR TRUE)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
||||
|
||||
@@ -2,4 +2,3 @@ DESCRIPTION
|
||||
===========
|
||||
|
||||
This is an installer created using CPack (https://cmake.org). No additional installation instructions provided.
|
||||
|
||||
|
||||
@@ -2,4 +2,3 @@ LICENSE
|
||||
=======
|
||||
|
||||
This is an installer created using CPack (https://cmake.org). No license provided.
|
||||
|
||||
|
||||
@@ -9,4 +9,3 @@ echo "RESOURCES: $RESOURCES"
|
||||
export DYLD_LIBRARY_PATH=$RESOURCES/lib
|
||||
|
||||
exec "$RESOURCES/bin/Executable"
|
||||
|
||||
|
||||
@@ -6,4 +6,3 @@
|
||||
<string>CMake</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
||||
|
||||
@@ -1,2 +1 @@
|
||||
get_directory_property(LF_VALUE LISTFILE_STACK)
|
||||
|
||||
|
||||
@@ -77,4 +77,3 @@
|
||||
|
||||
// test parenthesis in conditionals
|
||||
#cmakedefine CONDITIONAL_PARENTHESES
|
||||
|
||||
|
||||
@@ -1,2 +1 @@
|
||||
get_directory_property(LF_VALUE LISTFILE_STACK)
|
||||
|
||||
|
||||
@@ -77,4 +77,3 @@
|
||||
|
||||
// test parenthesis in conditionals
|
||||
#cmakedefine CONDITIONAL_PARENTHESES
|
||||
|
||||
|
||||
@@ -10,4 +10,3 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/generated.h
|
||||
)
|
||||
|
||||
add_library(GeneratedHeader main.cpp ${CMAKE_CURRENT_BINARY_DIR}/generated.h)
|
||||
|
||||
|
||||
@@ -29,4 +29,3 @@ int main ()
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
@@ -4,4 +4,3 @@ int main()
|
||||
{
|
||||
return customTarget();
|
||||
}
|
||||
|
||||
|
||||
@@ -16,4 +16,3 @@ target_link_libraries(case1d case1c)
|
||||
|
||||
add_executable(hello main.c)
|
||||
target_link_libraries(hello case1c case1b case1d case1c)
|
||||
|
||||
|
||||
@@ -1,3 +1,2 @@
|
||||
add_library( Eight EightSrc.c )
|
||||
target_link_libraries( Eight Seven )
|
||||
|
||||
|
||||
@@ -4,4 +4,3 @@
|
||||
link_libraries( NoDepB NoDepC NoDepA SixB SixA )
|
||||
|
||||
add_executable( exec ExecMain.c )
|
||||
|
||||
|
||||
@@ -9,4 +9,3 @@
|
||||
link_libraries( Eight Five )
|
||||
|
||||
add_executable( exec2 ExecMain.c )
|
||||
|
||||
|
||||
@@ -3,4 +3,3 @@
|
||||
link_libraries( Five Two Eight Five )
|
||||
|
||||
add_executable( exec3 ExecMain.c )
|
||||
|
||||
|
||||
@@ -3,4 +3,3 @@
|
||||
link_libraries( Five Two Five )
|
||||
|
||||
add_executable( exec4 ExecMain.c )
|
||||
|
||||
|
||||
@@ -1,3 +1,2 @@
|
||||
add_library( Five FiveSrc.c )
|
||||
target_link_libraries( Five Two )
|
||||
|
||||
|
||||
@@ -1,3 +1,2 @@
|
||||
add_library( Seven SevenSrc.c )
|
||||
target_link_libraries( Seven Two )
|
||||
|
||||
|
||||
@@ -9,4 +9,3 @@ add_library( SixA SixASrc.c )
|
||||
|
||||
add_library( SixB SixBSrc.c )
|
||||
target_link_libraries( SixB Four )
|
||||
|
||||
|
||||
@@ -1,3 +1,2 @@
|
||||
add_library( Three ThreeSrc.c )
|
||||
target_link_libraries( Three One Four )
|
||||
|
||||
|
||||
@@ -5,4 +5,3 @@ if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 1)
|
||||
set(PACKAGE_VERSION_EXACT 1)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
||||
@@ -5,4 +5,3 @@ if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 1)
|
||||
set(PACKAGE_VERSION_EXACT 1)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
||||
@@ -5,4 +5,3 @@ if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 4)
|
||||
set(PACKAGE_VERSION_EXACT 1)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
||||
@@ -2,4 +2,3 @@ set(PACKAGE_VERSION 2.0)
|
||||
if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 2)
|
||||
set(PACKAGE_VERSION_COMPATIBLE 1)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -2,4 +2,3 @@ set(PACKAGE_VERSION 3.0)
|
||||
if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 3)
|
||||
set(PACKAGE_VERSION_COMPATIBLE 1)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -5,4 +5,3 @@ if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 3)
|
||||
set(PACKAGE_VERSION_EXACT 1)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
||||
@@ -7,4 +7,3 @@ if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 3)
|
||||
set(PACKAGE_VERSION_EXACT 1)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
||||
@@ -3,4 +3,3 @@
|
||||
PRINT *, 'Hello'
|
||||
|
||||
END
|
||||
|
||||
|
||||
@@ -4,4 +4,3 @@
|
||||
CALL WORLD()
|
||||
|
||||
END
|
||||
|
||||
|
||||
@@ -3,4 +3,3 @@
|
||||
PRINT *, 'World!'
|
||||
|
||||
END
|
||||
|
||||
|
||||
@@ -8,4 +8,3 @@ class HelloWorld
|
||||
System.out.println("Hello World!");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -50,4 +50,3 @@ endif ()
|
||||
if (TEST_DEF AND SOME_CACHE_VARIABLE AND TEST_EXEC)
|
||||
add_definitions(-DCMAKE_IS_FUN)
|
||||
endif ()
|
||||
|
||||
|
||||
@@ -56,4 +56,3 @@ endif ()
|
||||
if (TEST_DEF AND SOME_CACHE_VARIABLE AND TEST_EXEC)
|
||||
add_definitions(-DCMAKE_IS_FUN)
|
||||
endif ()
|
||||
|
||||
|
||||
@@ -52,4 +52,3 @@ configure_file(
|
||||
|
||||
include_directories("${CMAKE_CURRENT_BINARY_DIR}")
|
||||
add_executable(MathTest MathTestExec.cxx)
|
||||
|
||||
|
||||
@@ -37,5 +37,3 @@ GT.M 15-AUG-2014 10:14:32 ZWR
|
||||
^ZZCOVERAGE("ZZCOVTST","T6",4)="1:0:0:0:41"
|
||||
^ZZCOVERAGE("ZZCOVTST","T6",5)="1:0:0:0:34"
|
||||
^ZZCOVERAGE("ZZCOVTST","T6",6)="1:0:0:0:38"
|
||||
|
||||
|
||||
|
||||
@@ -3,4 +3,3 @@
|
||||
#define TEST_FLAG_3
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1,2 +1 @@
|
||||
add_library(simpleLib simpleLib.cxx )
|
||||
|
||||
|
||||
@@ -74,4 +74,3 @@ add_executable(TestWithAuxSourceDir ${SOURCES})
|
||||
if(CMAKE_PAREN)
|
||||
target_link_libraries(TestWithAuxSourceDir testOddPath)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -12,4 +12,3 @@ create_test_sourcelist(testSrcs
|
||||
EXTRA_INCLUDE testArgs.h FUNCTION testProccessArgs)
|
||||
|
||||
add_executable(TestDriverTest ${testSrcs} ${Extra_SRCS})
|
||||
|
||||
|
||||
@@ -21,4 +21,3 @@ set (TRIGGER_SITE "")
|
||||
# set (SMTP_MAILHOST "")
|
||||
# set (CONTINUOUS_MONITOR_LIST "")
|
||||
# set (CONTINUOUS_BASE_URL "")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user