From 56661afc0538d6a2793d7d0243745aa5eed42264 Mon Sep 17 00:00:00 2001 From: James Turner Date: Fri, 4 May 2012 10:10:46 +0100 Subject: [PATCH] Change how HAVE_EXPAT_CONFIG_H is defined, to hopefully fix MSVC properly. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 11fb905e..215ecd09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -227,7 +227,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") set (WARNING_FLAGS "-Wall -Wno-overloaded-virtual") endif() -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS} ${MSVC_FLAGS} -DHAVE_EXPAT_CONFIG_H") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS} ${MSVC_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} ${MSVC_FLAGS} ${BOOST_CXX_FLAGS}") include_directories(${PROJECT_SOURCE_DIR}) @@ -238,8 +238,8 @@ include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${ALUT_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR} ) - add_definitions(-DHAVE_CONFIG_H) +add_definitions(-DHAVE_EXPAT_CONFIG_H) # configure a header file to pass some of the CMake settings # to the source code