Commit 30fbfd97 authored by Andy Cedilnik's avatar Andy Cedilnik
Browse files

Improve ansi support and fix build on visual studio

parent 33b6a670
......@@ -82,10 +82,28 @@ ENDIF(XDMF_SYSTEM_HDF5)
INCLUDE_DIRECTORIES(${XDMF_EXPAT_INCLUDE_DIRS})
IF(XDMF_BUILD_VTK)
SET(XDMF_USE_ANSI_STDLIB "${XDMF_USE_ANSI_STDLIB}" CACHE INTERNAL "store")
SET(XDMF_USE_ANSI_STDLIB ${VTK_USE_ANSI_STDLIB})
ELSE(XDMF_BUILD_VTK)
SET(XDMF_USE_ANSI_STDLIB "${XDMF_USE_ANSI_STDLIB}" CACHE BOOL "Ansi" FORCE)
IF(CMAKE_COMPILER_IS_GNUCXX)
OPTION(XDMF_USE_ANSI_STDLIB "Use the ANSI standard iostream library" ON)
ELSE(CMAKE_COMPILER_IS_GNUCXX)
IF(CMAKE_BUILD_TOOL MATCHES "devenv")
OPTION(XDMF_USE_ANSI_STDLIB "Use the ANSI standard iostream library" ON)
ELSE(CMAKE_BUILD_TOOL MATCHES "devenv")
OPTION(XDMF_USE_ANSI_STDLIB "Use the ANSI standard iostream library" OFF)
ENDIF(CMAKE_BUILD_TOOL MATCHES "devenv")
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
ENDIF(XDMF_BUILD_VTK)
SUBDIRS(libsrc binsrc)
IF(XDMF_BUILD_VTK)
SUBDIRS(vtk)
INCLUDE_DIRECTORIES(${Xdmf_SOURCE_DIR}/vtk
${Xdmf_BINARY_DIR}/vtk)
ENDIF(XDMF_BUILD_VTK)
# Add the testing directories
......
......@@ -51,16 +51,6 @@ CHECK_TYPE_SIZE("long long" SIZEOF_LONG_LONG)
OPTION(XDMF_BUILD_SHARED_LIBS "Build Shared XDMF Library" ON)
IF(CMAKE_COMPILER_IS_GNUCXX)
OPTION(XDMF_USE_ANSI_STDLIB "Use the ANSI standard iostream library" ON)
ELSE(CMAKE_COMPILER_IS_GNUCXX)
IF(CMAKE_BUILD_TOOL MATCHES "devenv")
OPTION(XDMF_USE_ANSI_STDLIB "Use the ANSI standard iostream library" ON)
ELSE(CMAKE_BUILD_TOOL MATCHES "devenv")
OPTION(XDMF_USE_ANSI_STDLIB "Use the ANSI standard iostream library" OFF)
ENDIF(CMAKE_BUILD_TOOL MATCHES "devenv")
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
CONFIGURE_FILE(${Xdmf_SOURCE_DIR}/libsrc/XdmfConfig.h.in
${Xdmf_BINARY_DIR}/libsrc/XdmfConfig.h)
......
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