From c2c83a353b5a3cb095b12b94827da35fcf7bf114 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 28 Jul 2015 14:17:49 +0200 Subject: [PATCH] + harmonize XercesC cmake variables with official check --- cMake/FindXercesC.cmake | 24 +++++++++---------- cMake/UseLibPack10x.cmake | 8 +++---- cMake/UseLibPack6x.cmake | 8 +++---- cMake/UseLibPack7x.cmake | 8 +++---- cMake/UseLibPack8x.cmake | 8 +++---- cMake/UseLibPack9x.cmake | 8 +++---- cMake/UseLibPackCLbundler.cmake | 6 ++--- cMake/UseLibPackCustom.cmake | 8 +++---- src/App/CMakeLists.txt | 2 +- src/Base/CMakeLists.txt | 10 ++++---- src/Gui/CMakeLists.txt | 2 +- src/Main/CMakeLists.txt | 4 ++-- src/Mod/Assembly/App/CMakeLists.txt | 2 +- src/Mod/Assembly/Gui/CMakeLists.txt | 2 +- src/Mod/Complete/App/CMakeLists.txt | 2 +- src/Mod/Complete/Gui/CMakeLists.txt | 2 +- src/Mod/Drawing/App/CMakeLists.txt | 2 +- src/Mod/Drawing/Gui/CMakeLists.txt | 2 +- src/Mod/Fem/App/CMakeLists.txt | 2 +- src/Mod/Fem/Gui/CMakeLists.txt | 2 +- src/Mod/Image/App/CMakeLists.txt | 2 +- src/Mod/Image/Gui/CMakeLists.txt | 2 +- src/Mod/Import/App/CMakeLists.txt | 2 +- src/Mod/Import/Gui/CMakeLists.txt | 2 +- src/Mod/Inspection/App/CMakeLists.txt | 2 +- src/Mod/Inspection/Gui/CMakeLists.txt | 2 +- src/Mod/Mesh/App/CMakeLists.txt | 2 +- src/Mod/Mesh/Gui/CMakeLists.txt | 2 +- src/Mod/MeshPart/App/CMakeLists.txt | 2 +- src/Mod/MeshPart/Gui/CMakeLists.txt | 2 +- src/Mod/Part/App/CMakeLists.txt | 2 +- src/Mod/Part/Gui/CMakeLists.txt | 2 +- src/Mod/PartDesign/App/CMakeLists.txt | 2 +- src/Mod/PartDesign/Gui/CMakeLists.txt | 2 +- src/Mod/Path/App/CMakeLists.txt | 2 +- src/Mod/Path/Gui/CMakeLists.txt | 2 +- src/Mod/Points/App/CMakeLists.txt | 2 +- src/Mod/Points/Gui/CMakeLists.txt | 2 +- src/Mod/Raytracing/App/CMakeLists.txt | 2 +- src/Mod/Raytracing/Gui/CMakeLists.txt | 2 +- src/Mod/ReverseEngineering/App/CMakeLists.txt | 2 +- src/Mod/ReverseEngineering/Gui/CMakeLists.txt | 2 +- src/Mod/Robot/App/CMakeLists.txt | 2 +- src/Mod/Robot/Gui/CMakeLists.txt | 2 +- src/Mod/Sandbox/App/CMakeLists.txt | 2 +- src/Mod/Sandbox/Gui/CMakeLists.txt | 2 +- src/Mod/Sketcher/App/CMakeLists.txt | 2 +- src/Mod/Sketcher/Gui/CMakeLists.txt | 2 +- src/Mod/Spreadsheet/App/CMakeLists.txt | 2 +- src/Mod/Spreadsheet/Gui/CMakeLists.txt | 2 +- src/Mod/Start/App/CMakeLists.txt | 2 +- src/Mod/Start/Gui/CMakeLists.txt | 2 +- src/Mod/Test/Gui/CMakeLists.txt | 2 +- src/Mod/Web/App/CMakeLists.txt | 2 +- src/Mod/Web/Gui/CMakeLists.txt | 2 +- 55 files changed, 91 insertions(+), 91 deletions(-) diff --git a/cMake/FindXercesC.cmake b/cMake/FindXercesC.cmake index 414f607210..f714b5bc9e 100644 --- a/cMake/FindXercesC.cmake +++ b/cMake/FindXercesC.cmake @@ -4,11 +4,11 @@ # Modified by Jos van den Oever # This module defines -# XERCESC_INCLUDE_DIR, where to find ptlib.h, etc. -# XERCESC_LIBRARIES, the libraries to link against to use pwlib. -# XERCESC_FOUND, If false, don't try to use pwlib. +# XercesC_INCLUDE_DIRS, where to find ptlib.h, etc. +# XercesC_LIBRARIES, the libraries to link against to use pwlib. +# XercesC_FOUND, If false, don't try to use pwlib. -FIND_PATH(XERCESC_INCLUDE_DIR xercesc/dom/DOM.hpp +FIND_PATH(XercesC_INCLUDE_DIRS xercesc/dom/DOM.hpp "[HKEY_CURRENT_USER\\software\\xerces-c\\src]" "[HKEY_CURRENT_USER\\xerces-c\\src]" $ENV{XERCESCROOT}/src/ @@ -16,7 +16,7 @@ FIND_PATH(XERCESC_INCLUDE_DIR xercesc/dom/DOM.hpp /usr/include ) -FIND_LIBRARY(XERCESC_LIBRARIES +FIND_LIBRARY(XercesC_LIBRARIES NAMES xerces-c PATHS @@ -28,21 +28,21 @@ FIND_LIBRARY(XERCESC_LIBRARIES ) # if the include a the library are found then we have it -IF(XERCESC_INCLUDE_DIR AND XERCESC_LIBRARIES) - SET(XERCESC_FOUND "YES" ) +IF(XercesC_INCLUDE_DIRS AND XercesC_LIBRARIES) + SET(XercesC_FOUND "YES" ) IF(NOT XERCESC__FIND_QUIETLY) - MESSAGE(STATUS "Found Xerces-C: ${XERCESC_LIBRARIES}") + MESSAGE(STATUS "Found Xerces-C: ${XercesC_LIBRARIES}") ENDIF(NOT XERCESC__FIND_QUIETLY) -ELSE(XERCESC_INCLUDE_DIR AND XERCESC_LIBRARIES) +ELSE(XercesC_INCLUDE_DIRS AND XercesC_LIBRARIES) IF(XERCESC_FIND_REQUIRED) MESSAGE(FATAL_ERROR "Xerces-C was not found.") ENDIF(XERCESC_FIND_REQUIRED) IF(NOT XERCESC__FIND_QUIETLY) MESSAGE(STATUS "Xerces-C was not found.") ENDIF(NOT XERCESC__FIND_QUIETLY) -ENDIF(XERCESC_INCLUDE_DIR AND XERCESC_LIBRARIES) +ENDIF(XercesC_INCLUDE_DIRS AND XercesC_LIBRARIES) #MARK_AS_ADVANCED( -# XERCESC_INCLUDE_DIR -# XERCESC_LIBRARIES +# XercesC_INCLUDE_DIRS +# XercesC_LIBRARIES #) diff --git a/cMake/UseLibPack10x.cmake b/cMake/UseLibPack10x.cmake index d4b789922a..9e85426129 100644 --- a/cMake/UseLibPack10x.cmake +++ b/cMake/UseLibPack10x.cmake @@ -18,10 +18,10 @@ set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe) set(PYTHONLIBS_FOUND TRUE) # XercesC -set(XERCESC_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/xerces-c-3.1.1) -set(XERCESC_LIBRARIES xerces-c_3.lib) -set(XERCESC_DEBUG_LIBRARIES xerces-c_3D.lib) -set(XERCESC_FOUND TRUE) +set(XercesC_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/xerces-c-3.1.1) +set(XercesC_LIBRARIES xerces-c_3.lib) +set(XercesC_DEBUG_LIBRARIES xerces-c_3D.lib) +set(XercesC_FOUND TRUE) # Boost set(Boost_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/boost-1_55) diff --git a/cMake/UseLibPack6x.cmake b/cMake/UseLibPack6x.cmake index 5af8cbae9f..da4bb87508 100644 --- a/cMake/UseLibPack6x.cmake +++ b/cMake/UseLibPack6x.cmake @@ -18,10 +18,10 @@ set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe) set(PYTHONLIBS_FOUND TRUE) # XercesC -set(XERCESC_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/xercesc) -set(XERCESC_LIBRARIES xerces-c_2.lib) -set(XERCESC_DEBUG_LIBRARIES xerces-c_2D.lib) -set(XERCESC_FOUND TRUE) +set(XercesC_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/xercesc) +set(XercesC_LIBRARIES xerces-c_2.lib) +set(XercesC_DEBUG_LIBRARIES xerces-c_2D.lib) +set(XercesC_FOUND TRUE) # Boost set(Boost_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/boost) diff --git a/cMake/UseLibPack7x.cmake b/cMake/UseLibPack7x.cmake index 36e51e64a8..3272e0a289 100644 --- a/cMake/UseLibPack7x.cmake +++ b/cMake/UseLibPack7x.cmake @@ -18,10 +18,10 @@ set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe) set(PYTHONLIBS_FOUND TRUE) # XercesC -set(XERCESC_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/xercesc) -set(XERCESC_LIBRARIES xerces-c_2.lib) -set(XERCESC_DEBUG_LIBRARIES xerces-c_2D.lib) -set(XERCESC_FOUND TRUE) +set(XercesC_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/xercesc) +set(XercesC_LIBRARIES xerces-c_2.lib) +set(XercesC_DEBUG_LIBRARIES xerces-c_2D.lib) +set(XercesC_FOUND TRUE) # Boost set(Boost_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/boost) diff --git a/cMake/UseLibPack8x.cmake b/cMake/UseLibPack8x.cmake index 0047aeee1c..651e584a1c 100644 --- a/cMake/UseLibPack8x.cmake +++ b/cMake/UseLibPack8x.cmake @@ -18,10 +18,10 @@ set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe) set(PYTHONLIBS_FOUND TRUE) # XercesC -set(XERCESC_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/xercesc) -set(XERCESC_LIBRARIES xerces-c_2.lib) -set(XERCESC_DEBUG_LIBRARIES xerces-c_2D.lib) -set(XERCESC_FOUND TRUE) +set(XercesC_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/xercesc) +set(XercesC_LIBRARIES xerces-c_2.lib) +set(XercesC_DEBUG_LIBRARIES xerces-c_2D.lib) +set(XercesC_FOUND TRUE) # Boost set(Boost_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/boost) diff --git a/cMake/UseLibPack9x.cmake b/cMake/UseLibPack9x.cmake index 974a6ad00a..31fa3abdd4 100644 --- a/cMake/UseLibPack9x.cmake +++ b/cMake/UseLibPack9x.cmake @@ -18,10 +18,10 @@ set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe) set(PYTHONLIBS_FOUND TRUE) # XercesC -set(XERCESC_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/xerces-c-3.1.0) -set(XERCESC_LIBRARIES xerces-c_3.lib) -set(XERCESC_DEBUG_LIBRARIES xerces-c_3D.lib) -set(XERCESC_FOUND TRUE) +set(XercesC_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/xerces-c-3.1.0) +set(XercesC_LIBRARIES xerces-c_3.lib) +set(XercesC_DEBUG_LIBRARIES xerces-c_3D.lib) +set(XercesC_FOUND TRUE) # Boost set(Boost_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/boost-1_54) diff --git a/cMake/UseLibPackCLbundler.cmake b/cMake/UseLibPackCLbundler.cmake index a06b34c886..1da79eeff3 100644 --- a/cMake/UseLibPackCLbundler.cmake +++ b/cMake/UseLibPackCLbundler.cmake @@ -12,9 +12,9 @@ set(PYTHON_LIBRARY ${FREECAD_LIBPACK_DIR}/lib/python27.lib CACHE FILEPATH "" FOR set(PYTHON_DEBUG_LIBRARY ${FREECAD_LIBPACK_DIR}/lib/python27_d.lib CACHE FILEPATH "" FORCE) set(PYTHON_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/python2.7 CACHE PATH "" FORCE) -find_library(XERCESC_LIBRARIES xerces-c_3 "${FREECAD_LIBPACK_DIR}/lib") -find_library(XERCESC_DEBUG_LIBRARIES xerces-c_3D "${FREECAD_LIBPACK_DIR}/lib") -set(XERCESC_FOUND TRUE) +find_library(XercesC_LIBRARIES xerces-c_3 "${FREECAD_LIBPACK_DIR}/lib") +find_library(XercesC_DEBUG_LIBRARIES xerces-c_3D "${FREECAD_LIBPACK_DIR}/lib") +set(XercesC_FOUND TRUE) find_library(COIN3D_LIBRARY_RELEASE coin4 "${FREECAD_LIBPACK_DIR}/lib") find_library(COIN3D_LIBRARY_DEBUG coin4d "${FREECAD_LIBPACK_DIR}/lib") diff --git a/cMake/UseLibPackCustom.cmake b/cMake/UseLibPackCustom.cmake index 46a46ac361..b0596296b4 100644 --- a/cMake/UseLibPackCustom.cmake +++ b/cMake/UseLibPackCustom.cmake @@ -18,10 +18,10 @@ set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe) set(PYTHONLIBS_FOUND TRUE) # XercesC -set(XERCESC_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/xerces-c-3.1.0) -set(XERCESC_LIBRARIES xerces-c_3.lib) -set(XERCESC_DEBUG_LIBRARIES xerces-c_3D.lib) -set(XERCESC_FOUND TRUE) +set(XercesC_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/xerces-c-3.1.0) +set(XercesC_LIBRARIES xerces-c_3.lib) +set(XercesC_DEBUG_LIBRARIES xerces-c_3D.lib) +set(XercesC_FOUND TRUE) # Boost set(Boost_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/boost-1_41) diff --git a/src/App/CMakeLists.txt b/src/App/CMakeLists.txt index 946987708d..12a5af5849 100644 --- a/src/App/CMakeLists.txt +++ b/src/App/CMakeLists.txt @@ -18,7 +18,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ${QT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ) diff --git a/src/Base/CMakeLists.txt b/src/Base/CMakeLists.txt index b66c5fb9db..9a25275ab2 100644 --- a/src/Base/CMakeLists.txt +++ b/src/Base/CMakeLists.txt @@ -11,7 +11,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ${QT_QTCORE_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${PYCXX_INCLUDE_DIR} @@ -21,8 +21,8 @@ if(MSVC) set(FreeCADBase_LIBS ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} - debug ${XERCESC_DEBUG_LIBRARIES} - optimized ${XERCESC_LIBRARIES} + debug ${XercesC_DEBUG_LIBRARIES} + optimized ${XercesC_LIBRARIES} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARIES} debug MSVCRTD.LIB @@ -35,7 +35,7 @@ if(MSVC) elseif(MINGW) set(FreeCADBase_LIBS ${PYTHON_LIBRARIES} - ${XERCESC_LIBRARIES} + ${XercesC_LIBRARIES} ${QT_QTCORE_LIBRARY} ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} @@ -44,7 +44,7 @@ elseif(MINGW) else(MSVC) set(FreeCADBase_LIBS ${PYTHON_LIBRARIES} - ${XERCESC_LIBRARIES} + ${XercesC_LIBRARIES} ${QT_QTCORE_LIBRARY} ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt index 0b80130756..68341b0d19 100644 --- a/src/Gui/CMakeLists.txt +++ b/src/Gui/CMakeLists.txt @@ -33,7 +33,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ${QT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${3DCONNEXION_INCLUDE_DIR} diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt index b4c61b3a45..ed231d8298 100644 --- a/src/Main/CMakeLists.txt +++ b/src/Main/CMakeLists.txt @@ -8,7 +8,7 @@ if(BUILD_GUI) ${ZLIB_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) else(BUILD_GUI) include_directories( @@ -16,7 +16,7 @@ else(BUILD_GUI) ${ZLIB_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) endif(BUILD_GUI) diff --git a/src/Mod/Assembly/App/CMakeLists.txt b/src/Mod/Assembly/App/CMakeLists.txt index bab3479dce..50537fd164 100644 --- a/src/Mod/Assembly/App/CMakeLists.txt +++ b/src/Mod/Assembly/App/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( ${OCC_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} # ${ODE_INCLUDE_DIRS} ) diff --git a/src/Mod/Assembly/Gui/CMakeLists.txt b/src/Mod/Assembly/Gui/CMakeLists.txt index 6ef5fc3bd9..432839c5d2 100644 --- a/src/Mod/Assembly/Gui/CMakeLists.txt +++ b/src/Mod/Assembly/Gui/CMakeLists.txt @@ -6,7 +6,7 @@ include_directories( ${ZLIB_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} #${ODE_INCLUDE_DIRS} ) diff --git a/src/Mod/Complete/App/CMakeLists.txt b/src/Mod/Complete/App/CMakeLists.txt index feec813752..abeac43c77 100644 --- a/src/Mod/Complete/App/CMakeLists.txt +++ b/src/Mod/Complete/App/CMakeLists.txt @@ -6,7 +6,7 @@ include_directories( ${OCC_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) set(Complete_LIBS diff --git a/src/Mod/Complete/Gui/CMakeLists.txt b/src/Mod/Complete/Gui/CMakeLists.txt index fbeeec882a..fe7cb1f273 100644 --- a/src/Mod/Complete/Gui/CMakeLists.txt +++ b/src/Mod/Complete/Gui/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( ${QT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) set(CompleteGui_LIBS diff --git a/src/Mod/Drawing/App/CMakeLists.txt b/src/Mod/Drawing/App/CMakeLists.txt index 165cc2e416..51394aea12 100644 --- a/src/Mod/Drawing/App/CMakeLists.txt +++ b/src/Mod/Drawing/App/CMakeLists.txt @@ -10,7 +10,7 @@ include_directories( ${OCC_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Drawing/Gui/CMakeLists.txt b/src/Mod/Drawing/Gui/CMakeLists.txt index 8a7460f31c..0f03814a78 100644 --- a/src/Mod/Drawing/Gui/CMakeLists.txt +++ b/src/Mod/Drawing/Gui/CMakeLists.txt @@ -14,7 +14,7 @@ include_directories( ${QT_INCLUDE_DIR} ${OCC_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index 3966246f82..eb91c9a15c 100755 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -20,7 +20,7 @@ include_directories( ${OCC_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ${SMESH_INCLUDE_DIR} ) diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt index 4b8c4954c5..8face94c3c 100755 --- a/src/Mod/Fem/Gui/CMakeLists.txt +++ b/src/Mod/Fem/Gui/CMakeLists.txt @@ -18,7 +18,7 @@ include_directories( ${OCC_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ${SMESH_INCLUDE_DIR} ) diff --git a/src/Mod/Image/App/CMakeLists.txt b/src/Mod/Image/App/CMakeLists.txt index 2f0a515ea2..2cc1a2f00a 100644 --- a/src/Mod/Image/App/CMakeLists.txt +++ b/src/Mod/Image/App/CMakeLists.txt @@ -11,7 +11,7 @@ include_directories( ${PYTHON_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ${QT_INCLUDE_DIR} ) diff --git a/src/Mod/Image/Gui/CMakeLists.txt b/src/Mod/Image/Gui/CMakeLists.txt index 10e50e1dea..371aba4e60 100644 --- a/src/Mod/Image/Gui/CMakeLists.txt +++ b/src/Mod/Image/Gui/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( ${QT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) set(ImageGui_LIBS diff --git a/src/Mod/Import/App/CMakeLists.txt b/src/Mod/Import/App/CMakeLists.txt index 03bdce5e4d..dd6e7c4238 100644 --- a/src/Mod/Import/App/CMakeLists.txt +++ b/src/Mod/Import/App/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( ${OCC_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ${QT_INCLUDE_DIR} ) diff --git a/src/Mod/Import/Gui/CMakeLists.txt b/src/Mod/Import/Gui/CMakeLists.txt index 43d06c315a..2dca7bbc42 100644 --- a/src/Mod/Import/Gui/CMakeLists.txt +++ b/src/Mod/Import/Gui/CMakeLists.txt @@ -14,7 +14,7 @@ include_directories( ${QT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Inspection/App/CMakeLists.txt b/src/Mod/Inspection/App/CMakeLists.txt index 4d7b28f6a8..f0e7477700 100644 --- a/src/Mod/Inspection/App/CMakeLists.txt +++ b/src/Mod/Inspection/App/CMakeLists.txt @@ -13,7 +13,7 @@ include_directories( ${QT_QTCORE_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Inspection/Gui/CMakeLists.txt b/src/Mod/Inspection/Gui/CMakeLists.txt index a6dcbe17b6..d2c51078e3 100644 --- a/src/Mod/Inspection/Gui/CMakeLists.txt +++ b/src/Mod/Inspection/Gui/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( ${COIN3D_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ) diff --git a/src/Mod/Mesh/App/CMakeLists.txt b/src/Mod/Mesh/App/CMakeLists.txt index ae2320bf96..3ee8aabfa9 100644 --- a/src/Mod/Mesh/App/CMakeLists.txt +++ b/src/Mod/Mesh/App/CMakeLists.txt @@ -10,7 +10,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/3rdParty ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ${QT_QTCORE_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${EIGEN3_INCLUDE_DIR} diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt index 7f9e2bc0d5..275672dd85 100644 --- a/src/Mod/Mesh/Gui/CMakeLists.txt +++ b/src/Mod/Mesh/Gui/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( ${PYTHON_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${QT_INCLUDE_DIR} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) set(MeshGui_LIBS diff --git a/src/Mod/MeshPart/App/CMakeLists.txt b/src/Mod/MeshPart/App/CMakeLists.txt index 3e499d9969..735f4746aa 100644 --- a/src/Mod/MeshPart/App/CMakeLists.txt +++ b/src/Mod/MeshPart/App/CMakeLists.txt @@ -18,7 +18,7 @@ include_directories( ${OCC_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ${SMESH_INCLUDE_DIR} ) diff --git a/src/Mod/MeshPart/Gui/CMakeLists.txt b/src/Mod/MeshPart/Gui/CMakeLists.txt index 859da5fba9..0247f982d8 100644 --- a/src/Mod/MeshPart/Gui/CMakeLists.txt +++ b/src/Mod/MeshPart/Gui/CMakeLists.txt @@ -22,7 +22,7 @@ include_directories( ${QT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Part/App/CMakeLists.txt b/src/Mod/Part/App/CMakeLists.txt index b647146a8c..357bd399de 100644 --- a/src/Mod/Part/App/CMakeLists.txt +++ b/src/Mod/Part/App/CMakeLists.txt @@ -16,7 +16,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${QT_INCLUDE_DIR} diff --git a/src/Mod/Part/Gui/CMakeLists.txt b/src/Mod/Part/Gui/CMakeLists.txt index 7dd3a0d50c..7a33caf6bc 100644 --- a/src/Mod/Part/Gui/CMakeLists.txt +++ b/src/Mod/Part/Gui/CMakeLists.txt @@ -14,7 +14,7 @@ include_directories( ${OCC_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${QT_INCLUDE_DIR} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/PartDesign/App/CMakeLists.txt b/src/Mod/PartDesign/App/CMakeLists.txt index d53ef86a0e..a115a251ae 100644 --- a/src/Mod/PartDesign/App/CMakeLists.txt +++ b/src/Mod/PartDesign/App/CMakeLists.txt @@ -11,7 +11,7 @@ include_directories( ${OCC_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ${QT_INCLUDE_DIR} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/PartDesign/Gui/CMakeLists.txt b/src/Mod/PartDesign/Gui/CMakeLists.txt index ca7a8fca03..92e3ce3360 100644 --- a/src/Mod/PartDesign/Gui/CMakeLists.txt +++ b/src/Mod/PartDesign/Gui/CMakeLists.txt @@ -14,7 +14,7 @@ include_directories( ${QT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Path/App/CMakeLists.txt b/src/Mod/Path/App/CMakeLists.txt index 3f258502ac..11b5080095 100644 --- a/src/Mod/Path/App/CMakeLists.txt +++ b/src/Mod/Path/App/CMakeLists.txt @@ -16,7 +16,7 @@ include_directories( ${PYTHON_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${QT_INCLUDE_DIR} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Path/Gui/CMakeLists.txt b/src/Mod/Path/Gui/CMakeLists.txt index 5c8dae2393..0600a5b5f9 100644 --- a/src/Mod/Path/Gui/CMakeLists.txt +++ b/src/Mod/Path/Gui/CMakeLists.txt @@ -15,7 +15,7 @@ include_directories( ${QT_INCLUDE_DIR} ${EIGEN3_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Points/App/CMakeLists.txt b/src/Mod/Points/App/CMakeLists.txt index 59e50fffb8..082493c2ce 100644 --- a/src/Mod/Points/App/CMakeLists.txt +++ b/src/Mod/Points/App/CMakeLists.txt @@ -15,7 +15,7 @@ include_directories( ${EIGEN3_INCLUDE_DIR} ${PCL_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ) diff --git a/src/Mod/Points/Gui/CMakeLists.txt b/src/Mod/Points/Gui/CMakeLists.txt index c7a0dc7aae..0e21bbdcb0 100644 --- a/src/Mod/Points/Gui/CMakeLists.txt +++ b/src/Mod/Points/Gui/CMakeLists.txt @@ -10,7 +10,7 @@ include_directories( ${PYTHON_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${QT_INCLUDE_DIR} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) set(PointsGui_LIBS diff --git a/src/Mod/Raytracing/App/CMakeLists.txt b/src/Mod/Raytracing/App/CMakeLists.txt index 18710811ce..a4cb239cf2 100644 --- a/src/Mod/Raytracing/App/CMakeLists.txt +++ b/src/Mod/Raytracing/App/CMakeLists.txt @@ -11,7 +11,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Raytracing/Gui/CMakeLists.txt b/src/Mod/Raytracing/Gui/CMakeLists.txt index 01b8cba6a8..9938626c01 100644 --- a/src/Mod/Raytracing/Gui/CMakeLists.txt +++ b/src/Mod/Raytracing/Gui/CMakeLists.txt @@ -15,7 +15,7 @@ include_directories( ${PYTHON_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${QT_INCLUDE_DIR} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/ReverseEngineering/App/CMakeLists.txt b/src/Mod/ReverseEngineering/App/CMakeLists.txt index 795f9e8ffe..08a73f3804 100644 --- a/src/Mod/ReverseEngineering/App/CMakeLists.txt +++ b/src/Mod/ReverseEngineering/App/CMakeLists.txt @@ -13,7 +13,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${EIGEN3_INCLUDE_DIR} ${PCL_INCLUDE_DIRS} diff --git a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt index 4071ff71d6..0b5f625e63 100644 --- a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt +++ b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt @@ -14,7 +14,7 @@ include_directories( ${QT_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Robot/App/CMakeLists.txt b/src/Mod/Robot/App/CMakeLists.txt index d38b8b6797..bae201dbe9 100644 --- a/src/Mod/Robot/App/CMakeLists.txt +++ b/src/Mod/Robot/App/CMakeLists.txt @@ -16,7 +16,7 @@ include_directories( ${PYTHON_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${QT_INCLUDE_DIR} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Robot/Gui/CMakeLists.txt b/src/Mod/Robot/Gui/CMakeLists.txt index d7670c8d09..77ae1c35fc 100644 --- a/src/Mod/Robot/Gui/CMakeLists.txt +++ b/src/Mod/Robot/Gui/CMakeLists.txt @@ -17,7 +17,7 @@ include_directories( ${QT_INCLUDE_DIR} ${EIGEN3_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Sandbox/App/CMakeLists.txt b/src/Mod/Sandbox/App/CMakeLists.txt index 756d687a15..6efb1a6086 100644 --- a/src/Mod/Sandbox/App/CMakeLists.txt +++ b/src/Mod/Sandbox/App/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ${QT_QTCORE_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ) diff --git a/src/Mod/Sandbox/Gui/CMakeLists.txt b/src/Mod/Sandbox/Gui/CMakeLists.txt index db765719c4..bfc85da120 100644 --- a/src/Mod/Sandbox/Gui/CMakeLists.txt +++ b/src/Mod/Sandbox/Gui/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( ${PYTHON_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${QT_INCLUDE_DIR} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Sketcher/App/CMakeLists.txt b/src/Mod/Sketcher/App/CMakeLists.txt index 15cd92c65c..5c1bd7f694 100644 --- a/src/Mod/Sketcher/App/CMakeLists.txt +++ b/src/Mod/Sketcher/App/CMakeLists.txt @@ -25,7 +25,7 @@ include_directories( ${QT_QTCORE_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Sketcher/Gui/CMakeLists.txt b/src/Mod/Sketcher/Gui/CMakeLists.txt index ed0ca5684b..c52fa12621 100644 --- a/src/Mod/Sketcher/Gui/CMakeLists.txt +++ b/src/Mod/Sketcher/Gui/CMakeLists.txt @@ -15,7 +15,7 @@ include_directories( ${PYTHON_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${QT_INCLUDE_DIR} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Spreadsheet/App/CMakeLists.txt b/src/Mod/Spreadsheet/App/CMakeLists.txt index b4e7e74577..92777373a8 100644 --- a/src/Mod/Spreadsheet/App/CMakeLists.txt +++ b/src/Mod/Spreadsheet/App/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories( ${PYTHON_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ${QT_INCLUDE_DIR} ) diff --git a/src/Mod/Spreadsheet/Gui/CMakeLists.txt b/src/Mod/Spreadsheet/Gui/CMakeLists.txt index 2d44ea797c..e0f38d3a61 100644 --- a/src/Mod/Spreadsheet/Gui/CMakeLists.txt +++ b/src/Mod/Spreadsheet/Gui/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories( ${ZLIB_INCLUDE_DIR} ${SOQT_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) set(SpreadsheetGui_LIBS diff --git a/src/Mod/Start/App/CMakeLists.txt b/src/Mod/Start/App/CMakeLists.txt index 865c3c12f5..d5358d6f93 100644 --- a/src/Mod/Start/App/CMakeLists.txt +++ b/src/Mod/Start/App/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories( ${OCC_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) set(Start_LIBS diff --git a/src/Mod/Start/Gui/CMakeLists.txt b/src/Mod/Start/Gui/CMakeLists.txt index de0d68eb58..7f476071b1 100644 --- a/src/Mod/Start/Gui/CMakeLists.txt +++ b/src/Mod/Start/Gui/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( ${QT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) set(StartGui_LIBS diff --git a/src/Mod/Test/Gui/CMakeLists.txt b/src/Mod/Test/Gui/CMakeLists.txt index 85d70d6289..264e260603 100644 --- a/src/Mod/Test/Gui/CMakeLists.txt +++ b/src/Mod/Test/Gui/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src ${QT_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) set(TestGui_LIBS diff --git a/src/Mod/Web/App/CMakeLists.txt b/src/Mod/Web/App/CMakeLists.txt index c4052dd741..fee859a74a 100644 --- a/src/Mod/Web/App/CMakeLists.txt +++ b/src/Mod/Web/App/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( ${OCC_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ${QT_INCLUDE_DIR} ) diff --git a/src/Mod/Web/Gui/CMakeLists.txt b/src/Mod/Web/Gui/CMakeLists.txt index f723fe167e..123155542e 100644 --- a/src/Mod/Web/Gui/CMakeLists.txt +++ b/src/Mod/Web/Gui/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( ${QT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XERCESC_INCLUDE_DIR} + ${XercesC_INCLUDE_DIRS} ) set(WebGui_LIBS