kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

+ harmonize XercesC cmake variables with official check

Browse Source
This commit is contained in:
wmayer
2015-07-28 14:17:49 +02:00
parent 4d780ddfdd
commit c2c83a353b
55 changed files with 91 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cMake/FindXercesC.cmake
View File

@@ -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
#)

8
cMake/UseLibPack10x.cmake
View File

@@ -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)

8
cMake/UseLibPack6x.cmake
View File

@@ -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)

8
cMake/UseLibPack7x.cmake
View File

@@ -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)

8
cMake/UseLibPack8x.cmake
View File

@@ -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)

8
cMake/UseLibPack9x.cmake
View File

@@ -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)

6
cMake/UseLibPackCLbundler.cmake
View File

@@ -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")

8
cMake/UseLibPackCustom.cmake
View File

@@ -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)

2
src/App/CMakeLists.txt
View File

@@ -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}
)

10
src/Base/CMakeLists.txt
View File

@@ -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}

2
src/Gui/CMakeLists.txt
View File

@@ -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}

4
src/Main/CMakeLists.txt
View File

@@ -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)

2
src/Mod/Assembly/App/CMakeLists.txt
View File

@@ -5,7 +5,7 @@ include_directories(
${OCC_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${XERCESC_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
# ${ODE_INCLUDE_DIRS}
)

2
src/Mod/Assembly/Gui/CMakeLists.txt
View File

@@ -6,7 +6,7 @@ include_directories(
${ZLIB_INCLUDE_DIR}
${QT_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${XERCESC_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
#${ODE_INCLUDE_DIRS}
)

2
src/Mod/Complete/App/CMakeLists.txt
View File

@@ -6,7 +6,7 @@ include_directories(
${OCC_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${XERCESC_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)
set(Complete_LIBS

2
src/Mod/Complete/Gui/CMakeLists.txt
View File

@@ -5,7 +5,7 @@ include_directories(
${QT_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${XERCESC_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)
set(CompleteGui_LIBS

2
src/Mod/Drawing/App/CMakeLists.txt
View File

@@ -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})

2
src/Mod/Drawing/Gui/CMakeLists.txt
View File

@@ -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})

2
src/Mod/Fem/App/CMakeLists.txt
View File

@@ -20,7 +20,7 @@ include_directories(
${OCC_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${XERCESC_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
${SMESH_INCLUDE_DIR}
)

2
src/Mod/Fem/Gui/CMakeLists.txt
View File

@@ -18,7 +18,7 @@ include_directories(
${OCC_INCLUDE_DIR}
${QT_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${XERCESC_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
${SMESH_INCLUDE_DIR}
)

2
src/Mod/Image/App/CMakeLists.txt
View File

@@ -11,7 +11,7 @@ include_directories(
${PYTHON_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${XERCESC_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
${QT_INCLUDE_DIR}
)

2
src/Mod/Image/Gui/CMakeLists.txt
View File

@@ -12,7 +12,7 @@ include_directories(
${QT_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${XERCESC_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)
set(ImageGui_LIBS

2
src/Mod/Import/App/CMakeLists.txt
View File

@@ -12,7 +12,7 @@ include_directories(
${OCC_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${XERCESC_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
${QT_INCLUDE_DIR}
)

2
src/Mod/Import/Gui/CMakeLists.txt
View File

@@ -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})

2
src/Mod/Inspection/App/CMakeLists.txt
View File

@@ -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})

2
src/Mod/Inspection/Gui/CMakeLists.txt
View File

@@ -5,7 +5,7 @@ include_directories(
${COIN3D_INCLUDE_DIR}
${QT_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${XERCESC_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
)

2
src/Mod/Mesh/App/CMakeLists.txt
View File

@@ -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}

2
src/Mod/Mesh/Gui/CMakeLists.txt
View File

@@ -5,7 +5,7 @@ include_directories(
${PYTHON_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${QT_INCLUDE_DIR}
${XERCESC_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)
set(MeshGui_LIBS

2
src/Mod/MeshPart/App/CMakeLists.txt
View File

@@ -18,7 +18,7 @@ include_directories(
${OCC_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${XERCESC_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
${SMESH_INCLUDE_DIR}
)

2
src/Mod/MeshPart/Gui/CMakeLists.txt
View File

@@ -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})

2
src/Mod/Part/App/CMakeLists.txt
View File

@@ -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}

2
src/Mod/Part/Gui/CMakeLists.txt
View File

@@ -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})

2
src/Mod/PartDesign/App/CMakeLists.txt
View File

@@ -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})

2
src/Mod/PartDesign/Gui/CMakeLists.txt
View File

@@ -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})

2
src/Mod/Path/App/CMakeLists.txt
View File

@@ -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})

2
src/Mod/Path/Gui/CMakeLists.txt
View File

@@ -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})

2
src/Mod/Points/App/CMakeLists.txt
View File

@@ -15,7 +15,7 @@ include_directories(
${EIGEN3_INCLUDE_DIR}
${PCL_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS}
${XERCESC_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
)

2
src/Mod/Points/Gui/CMakeLists.txt
View File

@@ -10,7 +10,7 @@ include_directories(
${PYTHON_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${QT_INCLUDE_DIR}
${XERCESC_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)
set(PointsGui_LIBS

2
src/Mod/Raytracing/App/CMakeLists.txt
View File

@@ -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})

2
src/Mod/Raytracing/Gui/CMakeLists.txt
View File

@@ -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})

2
src/Mod/ReverseEngineering/App/CMakeLists.txt
View File

@@ -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}

2
src/Mod/ReverseEngineering/Gui/CMakeLists.txt
View File

@@ -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})

2
src/Mod/Robot/App/CMakeLists.txt
View File

@@ -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})

2
src/Mod/Robot/Gui/CMakeLists.txt
View File

@@ -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})

2
src/Mod/Sandbox/App/CMakeLists.txt
View File

@@ -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}
)

2
src/Mod/Sandbox/Gui/CMakeLists.txt
View File

@@ -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})

2
src/Mod/Sketcher/App/CMakeLists.txt
View File

@@ -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})

2
src/Mod/Sketcher/Gui/CMakeLists.txt
View File

@@ -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})

2
src/Mod/Spreadsheet/App/CMakeLists.txt
View File

@@ -8,7 +8,7 @@ include_directories(
${PYTHON_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${XERCESC_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
${QT_INCLUDE_DIR}
)

2
src/Mod/Spreadsheet/Gui/CMakeLists.txt
View File

@@ -7,7 +7,7 @@ include_directories(
${ZLIB_INCLUDE_DIR}
${SOQT_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${XERCESC_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)
set(SpreadsheetGui_LIBS

2
src/Mod/Start/App/CMakeLists.txt
View File

@@ -3,7 +3,7 @@ include_directories(
${OCC_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${XERCESC_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)
set(Start_LIBS

2
src/Mod/Start/Gui/CMakeLists.txt
View File

@@ -5,7 +5,7 @@ include_directories(
${QT_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${XERCESC_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)
set(StartGui_LIBS

2
src/Mod/Test/Gui/CMakeLists.txt
View File

@@ -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

2
src/Mod/Web/App/CMakeLists.txt
View File

@@ -5,7 +5,7 @@ include_directories(
${OCC_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${XERCESC_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
${QT_INCLUDE_DIR}
)

2
src/Mod/Web/Gui/CMakeLists.txt
View File

@@ -5,7 +5,7 @@ include_directories(
${QT_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${XERCESC_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)
set(WebGui_LIBS