Commit 8c9e5e37 authored by Ben Boeckel's avatar Ben Boeckel

cmake: remove arguments from else and endfoo in hdf5

Change-Id: I861b65fe0272e8c78844200a3f14040ae045b10d
parent 355a11ce
......@@ -60,7 +60,7 @@ if(HDF5_ENABLE_Z_LIB_SUPPORT)
set(ZLIB_INCLUDE_DIRS "${vtkzlib_INCLUDE_DIRS}")
set(ZLIB_LIBRARIES "${vtkzlib_LIBRARIES}")
set(H5_ZLIB_HEADER "vtk_zlib.h")
endif(HDF5_ENABLE_Z_LIB_SUPPORT)
endif()
add_subdirectory(vtkhdf5)
......
This diff is collapsed.
......@@ -32,38 +32,38 @@ MACRO (SZIP_ADJUST_LIB_VARS basename)
SET (${basename}_LIBRARY_DEBUG ${${basename}_LIBRARY_RELEASE})
SET (${basename}_LIBRARY ${${basename}_LIBRARY_RELEASE})
SET (${basename}_LIBRARIES ${${basename}_LIBRARY_RELEASE})
ENDIF (${basename}_LIBRARY_RELEASE AND NOT ${basename}_LIBRARY_DEBUG)
ENDIF ()
# if only the debug version was found, set the release variable also to the debug version
IF (${basename}_LIBRARY_DEBUG AND NOT ${basename}_LIBRARY_RELEASE)
SET (${basename}_LIBRARY_RELEASE ${${basename}_LIBRARY_DEBUG})
SET (${basename}_LIBRARY ${${basename}_LIBRARY_DEBUG})
SET (${basename}_LIBRARIES ${${basename}_LIBRARY_DEBUG})
ENDIF (${basename}_LIBRARY_DEBUG AND NOT ${basename}_LIBRARY_RELEASE)
ENDIF ()
IF (${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE)
# if the generator supports configuration types then set
# optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value
IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
SET (${basename}_LIBRARY optimized ${${basename}_LIBRARY_RELEASE} debug ${${basename}_LIBRARY_DEBUG})
ELSE(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
ELSE()
# if there are no configuration types and CMAKE_BUILD_TYPE has no value
# then just use the release libraries
SET (${basename}_LIBRARY ${${basename}_LIBRARY_RELEASE} )
ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
ENDIF ()
SET (${basename}_LIBRARIES optimized ${${basename}_LIBRARY_RELEASE} debug ${${basename}_LIBRARY_DEBUG})
ENDIF (${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE)
ENDIF ()
SET (${basename}_LIBRARY ${${basename}_LIBRARY} CACHE FILEPATH "The ${basename} library")
IF (${basename}_LIBRARY)
SET (${basename}_FOUND 1)
ENDIF (${basename}_LIBRARY)
ENDIF ()
ENDIF (${basename}_INCLUDE_DIR )
ENDIF ()
# Make variables changeble to the advanced user
MARK_AS_ADVANCED (${basename}_LIBRARY ${basename}_LIBRARY_RELEASE ${basename}_LIBRARY_DEBUG ${basename}_INCLUDE_DIR )
ENDMACRO (SZIP_ADJUST_LIB_VARS)
ENDMACRO ()
# Look for the header file.
......@@ -93,10 +93,10 @@ FIND_PATH (SZIP_INCLUDE_DIR
IF (WIN32 AND NOT MINGW)
SET (SZIP_SEARCH_DEBUG_NAMES "sz_d;libsz_d")
SET (SZIP_SEARCH_RELEASE_NAMES "sz;libsz")
ELSE (WIN32 AND NOT MINGW)
ELSE ()
SET (SZIP_SEARCH_DEBUG_NAMES "sz_d")
SET (SZIP_SEARCH_RELEASE_NAMES "sz")
ENDIF (WIN32 AND NOT MINGW)
ENDIF ()
# Look for the library.
FIND_LIBRARY (SZIP_LIBRARY_DEBUG
......@@ -123,13 +123,13 @@ IF (SZIP_INCLUDE_DIR AND SZIP_LIBRARY)
ELSEIF (SZIP_LIBRARY_RELEASE)
GET_FILENAME_COMPONENT (SZIP_LIBRARY_PATH ${SZIP_LIBRARY_RELEASE} PATH)
SET (SZIP_LIB_DIR ${SZIP_LIBRARY_PATH})
ENDIF (SZIP_LIBRARY_DEBUG)
ENDIF ()
ELSE (SZIP_INCLUDE_DIR AND SZIP_LIBRARY)
ELSE ()
SET (SZIP_FOUND 0)
SET (SZIP_LIBRARIES)
SET (SZIP_INCLUDE_DIRS)
ENDIF (SZIP_INCLUDE_DIR AND SZIP_LIBRARY)
ENDIF ()
# Report the results.
IF (NOT SZIP_FOUND)
......@@ -138,12 +138,12 @@ IF (NOT SZIP_FOUND)
)
IF (NOT SZIP_FIND_QUIETLY)
MESSAGE (STATUS "${SZIP_DIR_MESSAGE}")
ELSE (NOT SZIP_FIND_QUIETLY)
ELSE ()
IF (SZIP_FIND_REQUIRED)
MESSAGE (FATAL_ERROR "SZip was NOT found and is Required by this project")
ENDIF (SZIP_FIND_REQUIRED)
ENDIF (NOT SZIP_FIND_QUIETLY)
ENDIF (NOT SZIP_FOUND)
ENDIF ()
ENDIF ()
ENDIF ()
IF (SZIP_FOUND)
INCLUDE (CheckSymbolExists)
......@@ -160,14 +160,14 @@ IF (SZIP_FOUND)
IF (HAVE_SZIP_DLL STREQUAL "TRUE")
SET (HAVE_SZIP_DLL "1")
ENDIF (HAVE_SZIP_DLL STREQUAL "TRUE")
ENDIF ()
# Restore CMAKE_REQUIRED_INCLUDES and CMAKE_REQUIRED_FLAGS variables
SET (CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE})
SET (CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_SAVE})
#
#############################################
ENDIF (SZIP_FOUND)
ENDIF ()
IF (FIND_SZIP_DEBUG)
MESSAGE (STATUS "SZIP_INCLUDE_DIR: ${SZIP_INCLUDE_DIR}")
......@@ -176,4 +176,4 @@ IF (FIND_SZIP_DEBUG)
MESSAGE (STATUS "SZIP_LIBRARY_RELEASE: ${SZIP_LIBRARY_RELEASE}")
MESSAGE (STATUS "HAVE_SZIP_DLL: ${HAVE_SZIP_DLL}")
MESSAGE (STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
ENDIF (FIND_SZIP_DEBUG)
ENDIF ()
......@@ -16,15 +16,15 @@ MACRO (HDF_CHECK_TYPE_SIZE TYPE VARIABLE)
FOREACH (def HAVE_SYS_TYPES_H HAVE_STDINT_H HAVE_STDDEF_H HAVE_INTTYPES_H)
IF ("${def}")
SET (MACRO_CHECK_TYPE_SIZE_FLAGS "${MACRO_CHECK_TYPE_SIZE_FLAGS} -D${def}")
ENDIF("${def}")
ENDFOREACH (def)
ENDIF()
ENDFOREACH ()
MESSAGE (STATUS "Check size of ${TYPE}")
IF (CMAKE_REQUIRED_LIBRARIES)
SET (CHECK_TYPE_SIZE_ADD_LIBRARIES
"-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
)
ENDIF (CMAKE_REQUIRED_LIBRARIES)
ENDIF ()
TRY_RUN (${VARIABLE} HAVE_${VARIABLE}
${CMAKE_BINARY_DIR}
${HDF5_PROJECT_DIR}/Resources/CheckTypeSize.c
......@@ -37,12 +37,12 @@ MACRO (HDF_CHECK_TYPE_SIZE TYPE VARIABLE)
FILE (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log
"Determining size of ${TYPE} passed with the following output:\n${OUTPUT}\n\n"
)
ELSE (HAVE_${VARIABLE})
ELSE ()
MESSAGE (STATUS "Check size of ${TYPE} - failed")
FILE (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
"Determining size of ${TYPE} failed with the following output:\n${OUTPUT}\n\n"
)
ENDIF (HAVE_${VARIABLE})
ENDIF ()
ENDIF ()
SET (CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS)
ENDMACRO (HDF_CHECK_TYPE_SIZE)
ENDMACRO ()
#-------------------------------------------------------------------------------
MACRO (SET_GLOBAL_VARIABLE name value)
SET (${name} ${value} CACHE INTERNAL "Used to pass variables between directories" FORCE)
ENDMACRO (SET_GLOBAL_VARIABLE)
ENDMACRO ()
#-------------------------------------------------------------------------------
MACRO (IDE_GENERATED_PROPERTIES SOURCE_PATH HEADERS SOURCES)
......@@ -14,7 +14,7 @@ MACRO (IDE_GENERATED_PROPERTIES SOURCE_PATH HEADERS SOURCES)
#SET_PROPERTY (SOURCE ${HEADERS}
# PROPERTY MACOSX_PACKAGE_LOCATION Headers/${NAME}
#)
ENDMACRO (IDE_GENERATED_PROPERTIES)
ENDMACRO ()
#-------------------------------------------------------------------------------
MACRO (IDE_SOURCE_PROPERTIES SOURCE_PATH HEADERS SOURCES)
......@@ -31,7 +31,7 @@ MACRO (IDE_SOURCE_PROPERTIES SOURCE_PATH HEADERS SOURCES)
#SET_PROPERTY (SOURCE ${HEADERS}
# PROPERTY MACOSX_PACKAGE_LOCATION Headers/${NAME}
#)
ENDMACRO (IDE_SOURCE_PROPERTIES)
ENDMACRO ()
#-------------------------------------------------------------------------------
MACRO (H5_NAMING target)
......@@ -40,12 +40,12 @@ MACRO (H5_NAMING target)
IF (H5_LEGACY_NAMING)
SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "dll")
SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX "${target}")
ELSE (H5_LEGACY_NAMING)
ELSE ()
SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "${target}dll")
ENDIF (H5_LEGACY_NAMING)
ENDIF (BUILD_SHARED_LIBS)
ENDIF (WIN32 AND NOT MINGW)
ENDMACRO (H5_NAMING)
ENDIF ()
ENDIF ()
ENDIF ()
ENDMACRO ()
#-------------------------------------------------------------------------------
MACRO (H5_SET_LIB_OPTIONS libtarget libname libtype)
......@@ -55,28 +55,28 @@ MACRO (H5_SET_LIB_OPTIONS libtarget libname libtype)
IF (H5_LEGACY_NAMING)
SET (LIB_RELEASE_NAME "${libname}dll")
SET (LIB_DEBUG_NAME "${libname}ddll")
ELSE (H5_LEGACY_NAMING)
ELSE ()
SET (LIB_RELEASE_NAME "${libname}")
SET (LIB_DEBUG_NAME "${libname}_D")
ENDIF (H5_LEGACY_NAMING)
ELSE (WIN32 AND NOT MINGW)
ENDIF ()
ELSE ()
SET (LIB_RELEASE_NAME "${libname}")
SET (LIB_DEBUG_NAME "${libname}_debug")
ENDIF (WIN32 AND NOT MINGW)
ELSE (${libtype} MATCHES "SHARED")
ENDIF ()
ELSE ()
IF (WIN32 AND NOT MINGW)
IF (H5_LEGACY_NAMING)
SET (LIB_RELEASE_NAME "${libname}")
SET (LIB_DEBUG_NAME "${libname}d")
ELSE (H5_LEGACY_NAMING)
ELSE ()
SET (LIB_RELEASE_NAME "lib${libname}")
SET (LIB_DEBUG_NAME "lib${libname}_D")
ENDIF (H5_LEGACY_NAMING)
ELSE (WIN32 AND NOT MINGW)
ENDIF ()
ELSE ()
SET (LIB_RELEASE_NAME "lib${libname}")
SET (LIB_DEBUG_NAME "lib${libname}_debug")
ENDIF (WIN32 AND NOT MINGW)
ENDIF (${libtype} MATCHES "SHARED")
ENDIF ()
ENDIF ()
# library names not mangled in this reduced distribution
......@@ -88,17 +88,17 @@ MACRO (H5_SET_LIB_OPTIONS libtarget libname libtype)
IMPORT_PREFIX ""
PREFIX ""
)
ENDIF (MINGW AND BUILD_SHARED_LIBS)
ENDIF ()
IF (BUILD_SHARED_LIBS)
IF (WIN32)
SET (LIBHDF_VERSION HDF5_PACKAGE_VERSION_MAJOR)
ELSE (WIN32)
ELSE ()
SET (LIBHDF_VERSION ${HDF5_PACKAGE_VERSION})
ENDIF (WIN32)
ENDIF ()
SET_TARGET_PROPERTIES (${libtarget} PROPERTIES VERSION ${LIBHDF_VERSION})
SET_TARGET_PROPERTIES (${libtarget} PROPERTIES SOVERSION ${LIBHDF_VERSION})
ENDIF (BUILD_SHARED_LIBS)
ENDIF ()
#-- Apple Specific install_name for libraries
IF (APPLE)
......@@ -109,8 +109,8 @@ MACRO (H5_SET_LIB_OPTIONS libtarget libname libtype)
INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
BUILD_WITH_INSTALL_RPATH ${HDF5_BUILD_WITH_INSTALL_NAME}
)
ENDIF (HDF5_BUILD_WITH_INSTALL_NAME)
ENDIF (APPLE)
ENDIF ()
ENDIF ()
ENDMACRO (H5_SET_LIB_OPTIONS)
ENDMACRO ()
......@@ -4,22 +4,22 @@
# arguments checking
IF (NOT TEST_PROGRAM)
MESSAGE (FATAL_ERROR "Require TEST_PROGRAM to be defined")
ENDIF (NOT TEST_PROGRAM)
ENDIF ()
#IF (NOT TEST_ARGS)
# MESSAGE (STATUS "Require TEST_ARGS to be defined")
#ENDIF (NOT TEST_ARGS)
#ENDIF ()
IF (NOT TEST_FOLDER)
MESSAGE ( FATAL_ERROR "Require TEST_FOLDER to be defined")
ENDIF (NOT TEST_FOLDER)
ENDIF ()
IF (NOT TEST_OUTPUT)
MESSAGE (FATAL_ERROR "Require TEST_OUTPUT to be defined")
ENDIF (NOT TEST_OUTPUT)
ENDIF ()
#IF (NOT TEST_EXPECT)
# MESSAGE (STATUS "Require TEST_EXPECT to be defined")
#ENDIF (NOT TEST_EXPECT)
#ENDIF ()
IF (NOT TEST_REFERENCE)
MESSAGE (FATAL_ERROR "Require TEST_REFERENCE to be defined")
ENDIF (NOT TEST_REFERENCE)
ENDIF ()
SET (ERROR_APPEND 1)
......@@ -41,16 +41,16 @@ MESSAGE (STATUS "COMMAND Result: ${TEST_RESULT}")
IF (ERROR_APPEND)
FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
FILE (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
ENDIF (ERROR_APPEND)
ENDIF ()
IF (TEST_APPEND)
FILE (APPEND ${TEST_OUTPUT} "${TEST_APPEND} ${TEST_RESULT}\n")
ENDIF (TEST_APPEND)
ENDIF ()
# if the return value is !=0 bail out
IF (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
MESSAGE ( FATAL_ERROR "Failed: Test program ${TEST_PROGRAM} exited != 0.\n${TEST_ERROR}")
ENDIF (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
ENDIF ()
MESSAGE (STATUS "COMMAND Error: ${TEST_ERROR}")
......@@ -59,12 +59,12 @@ IF (TEST_MASK)
#STRING(REGEX REPLACE "Modified:[^\n]+\n" "Modified: XXXX-XX-XX XX:XX:XX XXX\n" TEST_STREAM "${TEST_STREAM}")
STRING(REGEX REPLACE "Storage:[^\n]+\n" "Storage: <details removed for portability>\n" TEST_STREAM "${TEST_STREAM}")
FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
ENDIF (TEST_MASK)
ENDIF ()
IF (WIN32 AND NOT MINGW)
FILE (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
FILE (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
ENDIF (WIN32 AND NOT MINGW)
ENDIF ()
# now compare the output with the reference
EXECUTE_PROCESS (
......@@ -75,7 +75,7 @@ EXECUTE_PROCESS (
# again, if return value is !=0 scream and shout
IF (TEST_RESULT)
MESSAGE (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not match ${TEST_REFERENCE}")
ENDIF (TEST_RESULT)
ENDIF ()
# everything went fine...
MESSAGE ("Passed: The output of ${TEST_PROGRAM} matches ${TEST_REFERENCE}")
......
......@@ -5,7 +5,7 @@ PROJECT (HDF5_CPP)
#-----------------------------------------------------------------------------
IF (BUILD_SHARED_LIBS)
SET (CPP_BUILT_AS_DYNAMIC_LIB 1)
ENDIF (BUILD_SHARED_LIBS)
ENDIF ()
#-----------------------------------------------------------------------------
# Generate configure file
......@@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES (${HDF5_BINARY_DIR})
IF (H5_HAVE_PARALLEL)
ADD_DEFINITIONS ("-DMPICH_SKIP_MPICXX")
ADD_DEFINITIONS ("-DMPICH_IGNORE_CXX_SEEK")
ENDIF (H5_HAVE_PARALLEL)
ENDIF ()
ADD_SUBDIRECTORY (${HDF5_CPP_SOURCE_DIR}/src ${HDF5_CPP_BINARY_DIR}/src)
......@@ -35,11 +35,11 @@ ADD_SUBDIRECTORY (${HDF5_CPP_SOURCE_DIR}/src ${HDF5_CPP_BINARY_DIR}/src)
#-----------------------------------------------------------------------------
IF (HDF5_BUILD_EXAMPLES)
ADD_SUBDIRECTORY (${HDF5_CPP_SOURCE_DIR}/examples ${HDF5_CPP_BINARY_DIR}/examples)
ENDIF (HDF5_BUILD_EXAMPLES)
ENDIF ()
#-----------------------------------------------------------------------------
# Build the CPP unit tests
#-----------------------------------------------------------------------------
IF (BUILD_TESTING)
ADD_SUBDIRECTORY (${HDF5_CPP_SOURCE_DIR}/test ${HDF5_CPP_BINARY_DIR}/test)
ENDIF (BUILD_TESTING)
ENDIF ()
......@@ -5,7 +5,7 @@ PROJECT (HDF5_CPP_SRC)
#-----------------------------------------------------------------------------
IF (BUILD_SHARED_LIBS)
SET (CPP_BUILT_AS_DYNAMIC_LIB 1)
ENDIF (BUILD_SHARED_LIBS)
ENDIF ()
#-----------------------------------------------------------------------------
# Generate configure file
......@@ -95,7 +95,7 @@ INSTALL (
DESTINATION
${VTK_INSTALL_INCLUDE_DIR}/vtkhdf5/cpp
)
ENDIF (NOT VTK_INSTALL_NO_DEVELOPMENT)
ENDIF ()
#-----------------------------------------------------------------------------
# Add Target(s) to CMake Install for import into other projects
......@@ -110,5 +110,5 @@ IF (HDF5_EXPORTED_TARGETS AND NOT VTK_INSTALL_NO_LIBRARIES)
LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_ARCHIVE_DIR} COMPONENT Development
)
ENDIF (HDF5_EXPORTED_TARGETS AND NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF ()
......@@ -5,7 +5,7 @@ PROJECT (HDF5_HL)
#-----------------------------------------------------------------------------
IF (BUILD_SHARED_LIBS)
SET (HL_BUILT_AS_DYNAMIC_LIB 1)
ENDIF (BUILD_SHARED_LIBS)
ENDIF ()
#-----------------------------------------------------------------------------
# List Source files
......@@ -17,25 +17,25 @@ ADD_SUBDIRECTORY (${HDF5_HL_SOURCE_DIR}/src ${HDF5_HL_BINARY_DIR}/src)
#-- Build the High level Tools
IF (HDF5_BUILD_TOOLS)
ADD_SUBDIRECTORY (${HDF5_HL_SOURCE_DIR}/tools ${HDF5_HL_BINARY_DIR}/tools)
ENDIF (HDF5_BUILD_TOOLS)
ENDIF ()
#-- Add High Level Examples
IF (HDF5_BUILD_EXAMPLES)
ADD_SUBDIRECTORY (${HDF5_HL_SOURCE_DIR}/examples ${HDF5_HL_BINARY_DIR}/examples)
ENDIF (HDF5_BUILD_EXAMPLES)
ENDIF ()
#-- Build the Unit testing if requested
IF (NOT HDF5_EXTERNALLY_CONFIGURED)
IF (BUILD_TESTING)
ADD_SUBDIRECTORY (${HDF5_HL_SOURCE_DIR}/test ${HDF5_HL_BINARY_DIR}/test)
ENDIF (BUILD_TESTING)
ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED)
ENDIF ()
ENDIF ()
#-- Build the High Level Fortran source codes
IF (HDF5_BUILD_FORTRAN)
ADD_SUBDIRECTORY (fortran)
ENDIF (HDF5_BUILD_FORTRAN)
ENDIF ()
IF (HDF5_BUILD_CPP_LIB)
ADD_SUBDIRECTORY (${HDF5_HL_SOURCE_DIR}/c++ ${HDF5_HL_BINARY_DIR}/c++)
ENDIF (HDF5_BUILD_CPP_LIB)
ENDIF ()
......@@ -10,7 +10,7 @@ ADD_SUBDIRECTORY (${HDF5_HL_CPP_SOURCE_DIR}/src ${HDF5_HL_CPP_BINARY_DIR}/src)
# --------------------------------------------------------------------
IF (HDF5_BUILD_EXAMPLES)
ADD_SUBDIRECTORY (${HDF5_HL_CPP_SOURCE_DIR}/examples ${HDF5_HL_CPP_BINARY_DIR}/examples)
ENDIF (HDF5_BUILD_EXAMPLES)
ENDIF ()
# --------------------------------------------------------------------
# Add in the unit tests for the packet table c++ wrapper
......@@ -18,4 +18,4 @@ ENDIF (HDF5_BUILD_EXAMPLES)
IF (BUILD_TESTING)
ADD_SUBDIRECTORY (${HDF5_HL_CPP_SOURCE_DIR}/test ${HDF5_HL_CPP_BINARY_DIR}/test)
ENDIF (BUILD_TESTING)
ENDIF ()
......@@ -40,4 +40,4 @@ IF (HDF5_EXPORTED_TARGETS AND NOT VTK_INSTALL_NO_LIBRARIES)
LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_ARCHIVE_DIR} COMPONENT Development
)
ENDIF (HDF5_EXPORTED_TARGETS AND NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF ()
......@@ -5,7 +5,7 @@ PROJECT (HDF5_HL_SRC)
#-----------------------------------------------------------------------------
IF (BUILD_SHARED_LIBS)
SET (HL_BUILT_AS_DYNAMIC_LIB 1)
ENDIF (BUILD_SHARED_LIBS)
ENDIF ()
#-----------------------------------------------------------------------------
# List Source files
......@@ -63,4 +63,4 @@ IF (HDF5_EXPORTED_TARGETS AND NOT VTK_INSTALL_NO_LIBRARIES)
RUNTIME DESTINATION ${VTK_INSTALL_RUNTIME_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIBRARY_DIR} COMPONENT Development )
ENDIF (HDF5_EXPORTED_TARGETS AND NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF ()
......@@ -505,7 +505,7 @@ SET (H5_PUBLIC_HEADERS
IF (WIN32)
SET (common_SRCS ${common_SRCS} ${HDF5_SRC_DIR}/H5FDwindows.c)
SET (H5_PUBLIC_HEADERS ${H5_PUBLIC_HEADERS} ${HDF5_SRC_DIR}/H5FDwindows.h)
ENDIF (WIN32)
ENDIF ()
SET (H5_PRIVATE_HEADERS
${HDF5_SRC_DIR}/H5private.h
......@@ -553,7 +553,7 @@ IF (WIN32)
${H5_PRIVATE_HEADERS}
${HDF5_SRC_DIR}/H5win32defs.h
)
ENDIF (WIN32)
ENDIF ()
INCLUDE_DIRECTORIES (${HDF5_SOURCE_DIR})
INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR})
......@@ -574,11 +574,11 @@ INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR})
SET (CMD ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}${CFG_INIT}/H5detect${EXE_EXT})
IF (XCODE)
SET (CMD "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/\${CONFIGURATION}/H5detect")
ENDIF (XCODE)
ENDIF ()
ADD_EXECUTABLE (H5detect ${HDF5_SRC_DIR}/H5detect.c)
IF (WIN32)
TARGET_LINK_LIBRARIES (H5detect "ws2_32.lib")
ENDIF (WIN32)
ENDIF ()
ADD_CUSTOM_COMMAND (
OUTPUT ${HDF5_BINARY_DIR}/H5Tinit.c
......@@ -590,11 +590,11 @@ ADD_CUSTOM_COMMAND (
SET (CMDL ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}${CFG_INIT}/H5make_libsettings${EXE_EXT})
IF (XCODE)
SET (CMDL "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/\${CONFIGURATION}/H5make_libsettings")
ENDIF (XCODE)
ENDIF ()
ADD_EXECUTABLE (H5make_libsettings ${HDF5_SRC_DIR}/H5make_libsettings.c)
IF (WIN32)
TARGET_LINK_LIBRARIES (H5make_libsettings "ws2_32.lib")
ENDIF (WIN32)
ENDIF ()
ADD_CUSTOM_COMMAND (
OUTPUT ${HDF5_BINARY_DIR}/H5lib_settings.c
......@@ -634,7 +634,7 @@ INSTALL (
DESTINATION
${VTK_INSTALL_INCLUDE_DIR}/vtkhdf5
)
ENDIF (NOT VTK_INSTALL_NO_DEVELOPMENT)
ENDIF ()
#-----------------------------------------------------------------------------
# Add Target(s) to CMake Install for import into other projects
......@@ -649,4 +649,4 @@ IF (HDF5_EXPORTED_TARGETS AND NOT VTK_INSTALL_NO_LIBRARIES)
LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIBRARY_DIR} COMPONENT Development
)
ENDIF (HDF5_EXPORTED_TARGETS AND NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF ()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment