Commit 74a0865e authored by Ben Boeckel's avatar Ben Boeckel

cmake: remove arguments to else and endfoo commands

They're unnecessary and annoying to keep in-sync anyways. Just remove
them.

Change-Id: I7fc3bdad435406163823c3cbdf1e3b4263cf9a94
parent fd2f62fc
......@@ -109,12 +109,12 @@ endif()
if(NOT BUILD_SHARED_LIBS)
target_link_libraries(paraview
LINK_PRIVATE vtkPVStaticPluginsInit)
endif(NOT BUILD_SHARED_LIBS)
endif()
if (BUILD_TESTING)
add_subdirectory(Testing)
endif (BUILD_TESTING)
endif ()
#------------------------------------------------------------------------------
if (APPLE AND NOT PARAVIEW_DO_UNIX_STYLE_INSTALLS)
......
......@@ -71,4 +71,4 @@ IF (NOT VTK_INSTALL_NO_DEVELOPMENT)
FILES ${CMAKE_CURRENT_BINARY_DIR}/paraview.qch
DESTINATION ${VTK_INSTALL_DOC_DIR}
COMPONENT Development)
ENDIF (NOT VTK_INSTALL_NO_DEVELOPMENT)
ENDIF ()
......@@ -465,7 +465,7 @@ IF (PARAVIEW_USE_MPI)
# Hence disable them.
set (LineChartSelection_DISABLE_CS TRUE)
set (LineChartSelection_DISABLE_CRS TRUE)
ENDIF (PARAVIEW_USE_MPI)
ENDIF ()
# Composite Surface Selection is currently broken in everything but bultin
SET (CompositeSurfaceSelection_DISABLE_CS TRUE)
......@@ -519,7 +519,7 @@ IF (NOT BUILD_SHARED_LIBS)
SET (LoadPlugins_DISABLE_C TRUE)
SET (NiftiReaderWriterPlugin_DISABLE_C TRUE)
SET (SLACTools_DISABLE_C TRUE)
ENDIF (NOT BUILD_SHARED_LIBS)
ENDIF ()
# There should be a client server specific version of this test.
SET (AnalyzeReaderWriterPlugin_DISABLE_CS TRUE)
SET (H5PartReaderPlugin_DISABLE_CS TRUE)
......@@ -681,7 +681,7 @@ IF (PARAVIEW_CLIENT_RENDER_SERVER_TESTS)
add_client_render_server_tests("pvcrs"
TEST_SCRIPTS ${TESTS_WITH_INLINE_COMPARES}
)
ENDIF (PARAVIEW_CLIENT_RENDER_SERVER_TESTS)
ENDIF ()
# TODO: remote rendering tests and reverse connect tests.
......
This diff is collapsed.
......@@ -29,12 +29,12 @@ IF(SILO_INCLUDE_DIR)
#The following deprecated settings are for backwards compatibility with CMake1.4
SET (SILO_INCLUDE_PATH ${SILO_INCLUDE_DIR})
ELSE(SILO_LIBRARY)
ELSE()
IF(SILO_FIND_REQURIED)
message(SEND_ERROR "Unable to find the requested SILO libraries.")
ENDIF(SILO_FIND_REQURIED)
ENDIF(SILO_LIBRARY)
ENDIF(SILO_INCLUDE_DIR)
ENDIF()
ENDIF()
ENDIF()
# handle the QUIETLY and REQUIRED arguments and set SILO_FOUND to TRUE if
# all listed variables are TRUE
......
......@@ -104,7 +104,7 @@ FUNCTION(build_paraview_client BPC_NAME)
IF (NOT DEFINED BPC_VERSION_MAJOR OR NOT DEFINED BPC_VERSION_MINOR OR NOT DEFINED BPC_VERSION_PATCH)
MESSAGE(ERROR
"VERSION_MAJOR, VERSION_MINOR and VERSION_PATCH must be specified")
ENDIF (NOT DEFINED BPC_VERSION_MAJOR OR NOT DEFINED BPC_VERSION_MINOR OR NOT DEFINED BPC_VERSION_PATCH)
ENDIF ()
# If no title is provided, make one up using the name.
pv_set_if_not_set(BPC_TITLE "${BPC_NAME}")
......@@ -135,7 +135,7 @@ FUNCTION(build_paraview_client BPC_NAME)
"// remains consistent on all systems.\n"
"IDI_ICON1 ICON \"${BPC_APPLICATION_ICON}\"")
SET(exe_icon "${CMAKE_CURRENT_BINARY_DIR}/Icon.rc")
ENDIF (WIN32 AND BPC_APPLICATION_ICON)
ENDIF ()
# executable_flags are used to pass options to add_executable(..) call such as
# WIN32 or MACOSX_BUNDLE
......@@ -151,18 +151,18 @@ FUNCTION(build_paraview_client BPC_NAME)
PROPERTIES
MACOSX_PACKAGE_LOCATION Resources
)
ENDIF (BPC_BUNDLE_ICON)
ENDIF ()
IF(QT_MAC_USE_COCOA)
IF (IS_DIRECTORY "@QT_QTGUI_LIBRARY_RELEASE@")
GET_FILENAME_COMPONENT(qt_menu_nib
"@QT_QTGUI_LIBRARY_RELEASE@/Resources/qt_menu.nib"
REALPATH)
ELSE (IS_DIRECTORY "@QT_QTGUI_LIBRARY_RELEASE@")
ELSE ()
GET_FILENAME_COMPONENT(qt_menu_nib
"@QT_LIBRARY_DIR@/Resources/qt_menu.nib"
REALPATH)
ENDIF (IS_DIRECTORY "@QT_QTGUI_LIBRARY_RELEASE@")
ENDIF ()
set(qt_menu_nib_sources
"${qt_menu_nib}/classes.nib"
......@@ -174,17 +174,17 @@ FUNCTION(build_paraview_client BPC_NAME)
PROPERTIES
MACOSX_PACKAGE_LOCATION Resources/qt_menu.nib
)
ELSE(QT_MAC_USE_COCOA)
ELSE()
set(qt_menu_nib_sources)
ENDIF(QT_MAC_USE_COCOA)
ENDIF()
SET(executable_flags MACOSX_BUNDLE)
ENDIF (APPLE)
ENDIF ()
IF(WIN32)
LINK_DIRECTORIES(${QT_LIBRARY_DIR})
set (executable_flags WIN32)
ENDIF(WIN32)
ENDIF()
# If splash image is not specified, use the standard ParaView splash image.
pv_set_if_not_set(BPC_SPLASH_IMAGE "${branding_source_dir}/branded_splash.png")
......@@ -200,7 +200,7 @@ FUNCTION(build_paraview_client BPC_NAME)
SET (BPC_HAS_GUI_CONFIGURATION_XMLS 0)
IF (BPC_GUI_CONFIGURATION_XMLS)
SET (BPC_HAS_GUI_CONFIGURATION_XMLS 1)
ENDIF (BPC_GUI_CONFIGURATION_XMLS)
ENDIF ()
# Generate a resource file out of the splash image.
GENERATE_QT_RESOURCE_FROM_FILES(
......@@ -233,7 +233,7 @@ FUNCTION(build_paraview_client BPC_NAME)
SET (ui_resources ${ui_resources} "${outfile}")
set (ui_resource_init
"${ui_resource_init} Q_INIT_RESOURCE(${BPC_NAME}_help);\n")
ENDIF (BPC_COMPRESSED_HELP_FILE)
ENDIF ()
IF (PARAVIEW_QT_VERSION VERSION_GREATER "4")
QT5_ADD_RESOURCES(rcs_sources
......@@ -285,8 +285,8 @@ FUNCTION(build_paraview_client BPC_NAME)
INSTALL(TARGETS pq${BPC_NAME}Initializer
DESTINATION ${PV_INSTALL_LIB_DIR}
COMPONENT Runtime)
ENDIF (PV_INSTALL_LIB_DIR)
ENDIF (BPC_MAKE_INITIALIZER_LIBRARY)
ENDIF ()
ENDIF ()
SET (PV_EXE_LIST ${BPC_NAME})
......@@ -314,7 +314,7 @@ FUNCTION(build_paraview_client BPC_NAME)
TARGET_LINK_LIBRARIES(${BPC_NAME}
LINK_PRIVATE
pq${BPC_NAME}Initializer)
ENDIF (BPC_MAKE_INITIALIZER_LIBRARY)
ENDIF ()
if (pv_exe_suffix)
install(TARGETS ${BPC_NAME}
......@@ -332,13 +332,13 @@ FUNCTION(build_paraview_client BPC_NAME)
IF (BPC_BUNDLE_ICON)
SET_TARGET_PROPERTIES(${BPC_NAME} PROPERTIES
MACOSX_BUNDLE_ICON_FILE ${bundle_icon_file})
ENDIF (BPC_BUNDLE_ICON)
ENDIF ()
SET_TARGET_PROPERTIES(${BPC_NAME} PROPERTIES
MACOSX_BUNDLE_BUNDLE_NAME "${BPC_APPLICATION_NAME}")
ENDIF (APPLE)
ENDIF ()
IF (PARAVIEW_QT_VERSION VERSION_GREATER "4")
SET_TARGET_PROPERTIES(${BPC_NAME} PROPERTIES
COMPILE_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
ENDIF (PARAVIEW_QT_VERSION VERSION_GREATER "4")
ENDFUNCTION(build_paraview_client)
ENDIF ()
ENDFUNCTION()
......@@ -36,7 +36,7 @@ MACRO(build_paraview_client_cpack_config_init)
SET(CPACK_BINARY_DRAGNDROP ON)
SET(CPACK_BINARY_PACKAGEMAKER OFF)
SET(CPACK_BINARY_STGZ OFF)
ENDIF(APPLE)
ENDIF()
SET(CPACK_PACKAGE_NAME "${BCC_PACKAGE_NAME}")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${BCC_DESCRIPTION}")
......@@ -60,26 +60,26 @@ MACRO(build_paraview_client_cpack_config_init)
IF (CMAKE_SYSTEM_PROCESSOR MATCHES "unknown")
SET (CMAKE_SYSTEM_PROCESSOR "x86")
ENDIF (CMAKE_SYSTEM_PROCESSOR MATCHES "unknown")
ENDIF ()
IF(NOT DEFINED CPACK_SYSTEM_NAME)
SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
ENDIF(NOT DEFINED CPACK_SYSTEM_NAME)
ENDIF()
IF(${CPACK_SYSTEM_NAME} MATCHES Windows)
IF(CMAKE_CL_64)
SET(CPACK_SYSTEM_NAME Win64-${CMAKE_SYSTEM_PROCESSOR})
ELSE(CMAKE_CL_64)
ELSE()
SET(CPACK_SYSTEM_NAME Win32-${CMAKE_SYSTEM_PROCESSOR})
ENDIF(CMAKE_CL_64)
ENDIF(${CPACK_SYSTEM_NAME} MATCHES Windows)
ENDIF()
ENDIF()
IF(${CPACK_SYSTEM_NAME} MATCHES Darwin AND CMAKE_OSX_ARCHITECTURES)
list(LENGTH CMAKE_OSX_ARCHITECTURES _length)
IF(_length GREATER 1)
SET(CPACK_SYSTEM_NAME Darwin-Universal)
ELSE(_length GREATER 1)
ELSE()
SET(CPACK_SYSTEM_NAME Darwin-${CMAKE_OSX_ARCHITECTURES})
ENDIF(_length GREATER 1)
ENDIF(${CPACK_SYSTEM_NAME} MATCHES Darwin AND CMAKE_OSX_ARCHITECTURES)
ENDIF()
ENDIF()
SET (CPACK_INSTALL_CMAKE_PROJECTS
......@@ -92,7 +92,7 @@ MACRO(build_paraview_client_cpack_config_init)
LIST(APPEND CPACK_INSTALL_CMAKE_PROJECTS
"${ParaView_BINARY_DIR}" "HDF5 C++ Library" "cpplibraries" "/"
)
ENDIF(HDF5_BUILD_CPP_LIB)
ENDIF()
IF(HDF5_BUILD_HL_LIB)
LIST(APPEND CPACK_INSTALL_CMAKE_PROJECTS
......@@ -102,8 +102,8 @@ MACRO(build_paraview_client_cpack_config_init)
LIST(APPEND CPACK_INSTALL_CMAKE_PROJECTS
"${ParaView_BINARY_DIR}" "HDF5 HL C++ Library" "hlcpplibraries" "/"
)
ENDIF(HDF5_BUILD_CPP_LIB)
ENDIF(HDF5_BUILD_HL_LIB)
ENDIF()
ENDIF()
# Append in CPACK rule for the Development Component
IF(NOT PV_INSTALL_NO_DEVELOPMENT)
......@@ -116,7 +116,7 @@ MACRO(build_paraview_client_cpack_config_init)
LIST(APPEND CPACK_INSTALL_CMAKE_PROJECTS
"${ParaView_BINARY_DIR}" "HDF5 C++ Library" "cppheaders" "/"
)
ENDIF(HDF5_BUILD_CPP_LIB)
ENDIF()
IF(HDF5_BUILD_HL_LIB)
LIST(APPEND CPACK_INSTALL_CMAKE_PROJECTS
......@@ -127,9 +127,9 @@ MACRO(build_paraview_client_cpack_config_init)
LIST(APPEND CPACK_INSTALL_CMAKE_PROJECTS
"${ParaView_BINARY_DIR}" "HDF5 HL C++ Library" "hlcppheaders" "/"
)
ENDIF(HDF5_BUILD_CPP_LIB)
ENDIF(HDF5_BUILD_HL_LIB)
ENDIF(NOT PV_INSTALL_NO_DEVELOPMENT)
ENDIF()
ENDIF()
ENDIF()
LIST(APPEND CPACK_INSTALL_CMAKE_PROJECTS
"${CMAKE_CURRENT_BINARY_DIR}" "${BCC_PACKAGE_NAME} Components" "BrandedRuntime" "/"
......@@ -139,7 +139,7 @@ MACRO(build_paraview_client_cpack_config_init)
# generator.
SET (CPACK_INSTALL_CMAKE_PROJECTS_DRAGNDROP
${CPACK_INSTALL_CMAKE_PROJECTS})
ENDMACRO(build_paraview_client_cpack_config_init)
ENDMACRO()
MACRO(build_paraview_client_cpack_config)
CONFIGURE_FILE("${ParaView_CMAKE_DIR}/ParaViewCPackOptions.cmake.in"
......@@ -149,7 +149,7 @@ MACRO(build_paraview_client_cpack_config)
SET (CPACK_PROJECT_CONFIG_FILE
"${CMAKE_CURRENT_BINARY_DIR}/CPack${CPACK_PACKAGE_NAME}Options.cmake")
INCLUDE(CPack)
ENDMACRO(build_paraview_client_cpack_config)
ENDMACRO()
# Function to install qt libraries. qtliblist is a list of libraries to install
......@@ -169,19 +169,19 @@ FUNCTION(install_qt_libs qtliblist componentname)
# COMMAND tar c ${QT_LIB_LIST}
# COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
# " COMPONENT ${componentname})
# ENDIF(NOT ${QT_LIB_NAME_tmp} MATCHES "\\.debug$")
# ENDIF()
# Install .so and versioned .so.x.y
GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
INSTALL(DIRECTORY ${QT_LIB_DIR_tmp}/ DESTINATION ${PV_INSTALL_LIB_DIR} COMPONENT Runtime
FILES_MATCHING PATTERN "${QT_LIB_NAME_tmp}*"
PATTERN "${QT_LIB_NAME_tmp}*.debug" EXCLUDE)
ELSE (NOT WIN32)
ELSE ()
GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME_WE)
INSTALL(FILES ${QT_DLL_PATH_tmp}/${QT_LIB_NAME_tmp}.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime)
ENDIF (NOT WIN32)
ENDIF (QT_${qtlib}_LIBRARY_RELEASE)
ENDFOREACH(qtlib)
ENDIF (NOT APPLE)
ENDFUNCTION(install_qt_libs)
ENDIF ()
ENDIF ()
ENDFOREACH()
ENDIF ()
ENDFUNCTION()
......@@ -12,7 +12,7 @@ function(CheckGitDirectory path submodule)
git submodule update --init
")
endif()
endfunction(CheckGitDirectory)
endfunction()
set(ParaView_Submodules VTK Utilities/IceT Utilities/Xdmf2 Qt/Testing)
......
......@@ -19,7 +19,7 @@ FUNCTION(GENERATE_QT_RESOURCE_FROM_FILES resource_file resource_prefix file_list
FILE(TO_NATIVE_PATH "${resource}" resource)
SET (pq_resource_file_contents
"${pq_resource_file_contents} <file alias=\"${alias}\">${resource}</file>\n")
ENDFOREACH (resource)
ENDFOREACH ()
SET (pq_resource_file_contents
"${pq_resource_file_contents} </qresource>\n</RCC>\n")
......@@ -28,7 +28,7 @@ FUNCTION(GENERATE_QT_RESOURCE_FROM_FILES resource_file resource_prefix file_list
configure_file(${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in
"${resource_file}")
unset (CMAKE_CONFIGURABLE_FILE_CONTENT)
ENDFUNCTION(GENERATE_QT_RESOURCE_FROM_FILES)
ENDFUNCTION()
#----------------------------------------------------------------------------
# PV_PARSE_ARGUMENTS is a macro useful for writing macros that take a key-word
......@@ -38,10 +38,10 @@ MACRO(PV_PARSE_ARGUMENTS prefix arg_names option_names)
SET(DEFAULT_ARGS)
FOREACH(arg_name ${arg_names})
SET(${prefix}_${arg_name})
ENDFOREACH(arg_name)
ENDFOREACH()
FOREACH(option ${option_names})
SET(${prefix}_${option} FALSE)
ENDFOREACH(option)
ENDFOREACH()
SET(current_arg_name DEFAULT_ARGS)
SET(current_arg_list)
......@@ -52,18 +52,18 @@ MACRO(PV_PARSE_ARGUMENTS prefix arg_names option_names)
SET(${prefix}_${current_arg_name} ${current_arg_list})
SET(current_arg_name ${arg})
SET(current_arg_list)
ELSE (is_arg_name GREATER -1)
ELSE ()
SET(loption_names ${option_names})
LIST(FIND loption_names "${arg}" is_option)
IF (is_option GREATER -1)
SET(${prefix}_${arg} TRUE)
ELSE (is_option GREATER -1)
ELSE ()
SET(current_arg_list ${current_arg_list} ${arg})
ENDIF (is_option GREATER -1)
ENDIF (is_arg_name GREATER -1)
ENDFOREACH(arg)
ENDIF ()
ENDIF ()
ENDFOREACH()
SET(${prefix}_${current_arg_name} ${current_arg_list})
ENDMACRO(PV_PARSE_ARGUMENTS)
ENDMACRO()
#----------------------------------------------------------------------------
# Macro for extracting Plugin path and name from arguments
......@@ -80,7 +80,7 @@ MACRO(PV_EXTRACT_CLIENT_SERVER_ARGS)
if(PV_LOAD_PLUGIN)
set(CLIENT_SERVER_ARGS ${CLIENT_SERVER_ARGS} "--test-plugin=${PV_LOAD_PLUGIN}")
endif()
ENDMACRO(PV_EXTRACT_CLIENT_SERVER_ARGS)
ENDMACRO()
#----------------------------------------------------------------------------
# Macro for setting values if a user did not overwrite them
......@@ -88,8 +88,8 @@ ENDMACRO(PV_EXTRACT_CLIENT_SERVER_ARGS)
MACRO(pv_set_if_not_set name value)
IF(NOT DEFINED "${name}")
SET(${name} "${value}")
ENDIF(NOT DEFINED "${name}")
ENDMACRO(pv_set_if_not_set)
ENDIF()
ENDMACRO()
#----------------------------------------------------------------------------
# When installing system libraries, on non-windows machines, the CMake variable
......@@ -105,19 +105,19 @@ FUNCTION (pv_install_library libpath dest component)
IF (APPLE)
GET_FILENAME_COMPONENT(name_tmp ${libpath} NAME_WE)
FILE(GLOB lib_list "${dir_tmp}/${name_tmp}*")
ELSE (APPLE)
ELSE ()
GET_FILENAME_COMPONENT(dir_tmp ${libpath} PATH)
GET_FILENAME_COMPONENT(name_tmp ${libpath} NAME)
FILE(GLOB lib_list RELATIVE "${dir_tmp}" "${libpath}*")
ENDIF (APPLE)
ENDIF ()
INSTALL(CODE "
MESSAGE(STATUS \"Installing ${name_tmp}\")
EXECUTE_PROCESS (WORKING_DIRECTORY ${dir_tmp}
COMMAND tar c ${lib_list}
COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${dest})
" COMPONENT ${component})
ENDIF (NOT WIN32)
ENDFUNCTION (pv_install_library)
ENDIF ()
ENDFUNCTION ()
#########################################################################
# Function to compile a proto file to generate a .h and .cc file
......@@ -138,7 +138,7 @@ FUNCTION (protobuf_generate out_cpp_file in_proto_file)
--proto_path ${path} ${absolute}
DEPENDS ${in_proto_file} protoc_compiler
)
ENDFUNCTION (protobuf_generate)
ENDFUNCTION ()
#########################################################################
# Function to generate header file from any file(s). Support ASCII as well as
......@@ -398,7 +398,7 @@ function(build_help_project name)
WORKING_DIRECTORY "${arg_DESTINATION_DIRECTORY}"
)
endfunction(build_help_project)
endfunction()
macro(pv_set_link_interface_libs target)
# if not lion then we need to set LINK_INTERFACE_LIBRARIES to reduce the number
......
......@@ -16,7 +16,7 @@ MACRO(paraview_build_optional_plugin name comment subdirectory default)
IF(PARAVIEW_BUILD_PLUGIN_${name})
MESSAGE(STATUS "Plugin: ${comment} enabled")
ADD_SUBDIRECTORY("${subdirectory}")
ELSE(PARAVIEW_BUILD_PLUGIN_${name})
ELSE()
MESSAGE(STATUS "Plugin: ${comment} disabled")
ENDIF(PARAVIEW_BUILD_PLUGIN_${name})
ENDMACRO(paraview_build_optional_plugin)
ENDIF()
ENDMACRO()
This diff is collapsed.
......@@ -122,12 +122,12 @@ MACRO (process_args out_extra_args)
SET (temp_args)
IF (ACT_BASELINE_DIR)
SET (temp_args "--test-baseline=DATA{${ACT_BASELINE_DIR}/${test_name}.png}")
ENDIF (ACT_BASELINE_DIR)
ENDIF ()
IF (${test_name}_THRESHOLD)
SET (temp_args ${temp_args} "--test-threshold=${${test_name}_THRESHOLD}")
ENDIF (${test_name}_THRESHOLD)
ENDIF ()
SET (${out_extra_args} ${${out_extra_args}} ${temp_args})
ENDMACRO (process_args)
ENDMACRO ()
FUNCTION (add_pv_test prefix skip_test_flag_suffix)
......@@ -157,25 +157,25 @@ FUNCTION (add_pv_test prefix skip_test_flag_suffix)
set (counter 100000) # stop the group;
# push the test back into the list.
list(INSERT ACT_TEST_SCRIPTS 0 ${test})
endif (${test_name}_BREAK)
endif (${counter} GREATER 0)
endif ()
endif ()
if (${counter} LESS 100000)
if (NOT ${test_name}${skip_test_flag_suffix})
set (full_test_name "${full_test_name}.${test_name}")
set (extra_args ${extra_args} "--test-script=${test}")
process_args(extra_args)
endif (NOT ${test_name}${skip_test_flag_suffix})
endif (${counter} LESS 100000)
endif (num_tests)
endif ()
endif ()
endif ()
math(EXPR counter "${counter} + 1")
if (DEFINED ${test_name}_BREAK)
set (counter 100000) # stop the group.
endif (DEFINED ${test_name}_BREAK)
endif ()
if (${test_name}_FORCE_SERIAL)
set (force_serial TRUE)
endif (${test_name}_FORCE_SERIAL)
endwhile (${counter} LESS ${TEST_GROUP_SIZE})
endif ()
endwhile ()
if (extra_args)
ExternalData_add_test(ParaViewData
......@@ -194,10 +194,10 @@ FUNCTION (add_pv_test prefix skip_test_flag_suffix)
# to instruct cmake to run just the ParaView tests with the '-L' flag.
# also add in any extra labels (e.g. CATALYST if they were passed in as arguments)
set_tests_properties("${prefix}${full_test_name}" PROPERTIES LABELS "PARAVIEW;${ACT_EXTRA_LABELS}")
endif (extra_args)
endwhile (ACT_TEST_SCRIPTS)
endif ()
endwhile ()
ENDFUNCTION (add_pv_test)
ENDFUNCTION ()
# Add macro to support addition of paraview web tests
FUNCTION(add_pvweb_tests prefix)
......@@ -289,7 +289,7 @@ FUNCTION (add_client_tests prefix)
${CLIENT_SERVER_ARGS}
--test-directory=${PARAVIEW_TEST_DIR}
${ARGN})
ENDFUNCTION (add_client_tests)
ENDFUNCTION ()
FUNCTION (add_client_server_tests prefix)
PV_EXTRACT_CLIENT_SERVER_ARGS(${ARGN})
......@@ -304,7 +304,7 @@ FUNCTION (add_client_server_tests prefix)
-dr
--test-directory=${PARAVIEW_TEST_DIR}
${ARGN})
ENDFUNCTION (add_client_server_tests)
ENDFUNCTION ()
FUNCTION (add_client_render_server_tests prefix)
PV_EXTRACT_CLIENT_SERVER_ARGS(${ARGN})
......@@ -322,7 +322,7 @@ FUNCTION (add_client_render_server_tests prefix)
-dr
--test-directory=${PARAVIEW_TEST_DIR}
${ARGN})
ENDFUNCTION (add_client_render_server_tests)
ENDFUNCTION ()
FUNCTION(add_multi_client_tests prefix)
PV_PARSE_ARGUMENTS(ACT "TEST_SCRIPTS;BASELINE_DIR" "" ${ARGN})
......@@ -361,12 +361,12 @@ FUNCTION(add_multi_client_tests prefix)
if (${test_name}_FORCE_SERIAL)
set_tests_properties("${prefix}.${test_name}" PROPERTIES RUN_SERIAL ON)
message(STATUS "Running in serial \"${prefix}.${test_name}\"")
endif (${test_name}_FORCE_SERIAL)
endif ()
set_tests_properties("${prefix}.${test_name}" PROPERTIES LABELS "PARAVIEW")
endif()
endforeach(test_script)
ENDFUNCTION(add_multi_client_tests)
endforeach()
ENDFUNCTION()
FUNCTION(add_multi_server_tests prefix nbServers)
PV_PARSE_ARGUMENTS(ACT "TEST_SCRIPTS;BASELINE_DIR" "" ${ARGN})
......@@ -391,8 +391,8 @@ FUNCTION(add_multi_server_tests prefix nbServers)
--exit
)
set_tests_properties("${prefix}.${test_name}" PROPERTIES LABELS "PARAVIEW")
endforeach(test_script)
ENDFUNCTION(add_multi_server_tests)
endforeach()
ENDFUNCTION()
FUNCTION (add_tile_display_tests prefix tdx tdy )
PV_PARSE_ARGUMENTS(ACT "TEST_SCRIPTS;BASELINE_DIR;LOAD_PLUGIN;PLUGIN_PATH" "" ${ARGN})
......@@ -431,7 +431,7 @@ FUNCTION (add_tile_display_tests prefix tdx tdy )
PROPERTY ENVIRONMENT "PV_ICET_WINDOW_BORDERS=1")
set_tests_properties("${prefix}-${tdx}x${tdy}.${test_name}" PROPERTIES RUN_SERIAL ON)
set_tests_properties("${prefix}-${tdx}x${tdy}.${test_name}" PROPERTIES LABELS "PARAVIEW")
endforeach(test_script)
endif(${REQUIRED_CPU} LESS ${VTK_MPI_MAX_NUMPROCS})
endforeach()
endif()
endif()
ENDFUNCTION (add_tile_display_tests)
ENDFUNCTION ()
This diff is collapsed.
......@@ -33,13 +33,13 @@ set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS ${new_compile_definition})
if (PARAVIEW_ENABLE_QT_SUPPORT)
if (PARAVIEW_QT_VERSION VERSION_GREATER "4")
include(ParaViewQt5)
else (PARAVIEW_QT_VERSION VERSION_GREATER "4")
else ()
set(QT_QMAKE_EXECUTABLE ${PARAVIEW_QT_QMAKE_EXECUTABLE})
find_package(Qt4)
if (QT4_FOUND)
include("${QT_USE_FILE}")
endif(QT4_FOUND)
endif(PARAVIEW_QT_VERSION VERSION_GREATER "4")
endif()
endif()
endif()
# Import some commonly used cmake modules
......
......@@ -155,16 +155,16 @@ MACRO(PV_PRE_WRAP_VTK_CS libname kit ukit deps)
IF("${class}" MATCHES "^(\\/|.\\/|.\\\\|.:\\/|.:\\\\)")
# handle full paths
SET(full_name "${class}.h")
ENDIF("${class}" MATCHES "^(\\/|.\\/|.\\\\|.:\\/|.:\\\\)")
ENDIF()
IF(NOT VTK_CLASS_WRAP_EXCLUDE_${class})
IF(VTK_CLASS_ABSTRACT_${class})
SET_SOURCE_FILES_PROPERTIES(${full_name} PROPERTIES ABSTRACT 1)
ENDIF(VTK_CLASS_ABSTRACT_${class})
ENDIF()
SET(vtk${kit}CS_HEADERS ${vtk${kit}CS_HEADERS} ${full_name})
ENDIF(NOT VTK_CLASS_WRAP_EXCLUDE_${class})
ENDFOREACH(class)
ENDIF()
ENDFOREACH()
VTK_WRAP_ClientServer("${libname}" "vtk${kit}CS_SRCS" "${vtk${kit}CS_HEADERS}")
ENDMACRO(PV_PRE_WRAP_VTK_CS kit ukit deps)
ENDMACRO()
#------------------------------------------------------------------------------
# Macro to create ClientServer wrappers classes in a single VTK kit.
......@@ -177,7 +177,7 @@ MACRO(PV_WRAP_VTK_CS kit ukit deps)
FOREACH(dep ${deps})
#MESSAGE("Link vtk${kit}CS to vtk${dep}CS")
TARGET_LINK_LIBRARIES(vtk${kit}CS vtk${dep}CS)
ENDFOREACH(dep)
ENDFOREACH()
IF(PARAVIEW_SOURCE_DIR OR ParaView_SOURCE_DIR)
IF(BUILD_SHARED_LIBS)
IF(NOT PV_INSTALL_NO_LIBRARIES)
......@@ -186,10 +186,10 @@ MACRO(PV_WRAP_VTK_CS kit ukit deps)
RUNTIME DESTINATION ${VTK_INSTALL_RUNTIME_DIR} COMPONENT Runtime
LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR} COMPONENT Runtime
ARCHIVE DESTINATION ${VTK_INSTALL_ARCHIVE_DIR} COMPONENT Development)
ENDIF(NOT PV_INSTALL_NO_LIBRARIES)
ENDIF(BUILD_SHARED_LIBS)
ENDIF(PARAVIEW_SOURCE_DIR OR ParaView_SOURCE_DIR)
ENDIF()
ENDIF()
ENDIF()
IF(KIT_CS_DEPS)
ADD_DEPENDENCIES(vtk${kit}CS ${KIT_CS_DEPS})
ENDIF(KIT_CS_DEPS)
ENDMACRO(PV_WRAP_VTK_CS)
ENDIF()
ENDMACRO()
......@@ -104,7 +104,7 @@ macro(VTK_WRAP_ClientServer TARGET SRC_LIST_NAME SOURCES)
)
endif ()
endforeach(FILE)
endforeach()
# Create the Init File
configure_file(
......@@ -123,4 +123,4 @@ macro(VTK_WRAP_ClientServer TARGET SRC_LIST_NAME SOURCES)
unset(NO_PYTHON_BINDINGS_AVAILABLE)
endmacro(VTK_WRAP_ClientServer)
endmacro()
......@@ -432,13 +432,13 @@ if (PARAVIEW_ENABLE_QT_SUPPORT)
if (NOT QT5_FOUND)
message( SEND_ERROR "Qt ${QT_MIN_VERSION} or greater not found. "
"Please set the Qt5Core_DIR variable." )
endif (NOT QT5_FOUND)
else (PARAVIEW_QT_VERSION VERSION_GREATER "4")
endif ()
else ()
find_package (Qt4)
if (NOT QT4_FOUND)
message (SEND_ERROR "Qt ${QT_MIN_VERSION} or greater not found. "
"Please set the QT_QMAKE_EXECUTABLE variable.")
else (NOT QT4_FOUND)
else ()
# check is Qtversion is 4.8.*. If so, we are good. Otherwise we will post a
# warning of versions (>= 4.7 && < 4.8). However we report errors for any
# version less than 4.7
......@@ -449,14 +449,14 @@ if (PARAVIEW_ENABLE_QT_SUPPORT)
message(SEND_ERROR "Qt ${QTVERSION} not supported. "
"Please use ${QT_OFFICIAL_VERSION} (you may need to clean your dirtied cache)."
"Minium required version is ${QT_MIN_VERSION}.")
else (qt_version46_x_tmp)
else ()
message(WARNING "Warning: You are using Qt ${QTVERSION}. "
"Officially supported version is Qt ${QT_OFFICIAL_VERSION}")
endif (qt_version46_x_tmp)
endif (NOT qt_version_match)
endif (NOT QT4_FOUND)
endif (PARAVIEW_QT_VERSION VERSION_GREATER "4")
endif (PARAVIEW_ENABLE_QT_SUPPORT)
endif ()