+ compile with clang

2014-05-05 16:24:01 +02:00 · 2014-05-05 16:24:01 +02:00 · 3b6d07833d
commit 3b6d07833d
parent 213a09c163
19 changed files with 114 additions and 95 deletions
--- a/src/Mod/Drawing/App/CMakeLists.txt
+++ b/src/Mod/Drawing/App/CMakeLists.txt
@ -5,6 +5,7 @@ else(MSVC)
 endif(MSVC)

 include_directories(
+    ${CMAKE_BINARY_DIR}
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
    ${ZLIB_INCLUDE_DIR}
--- a/src/Mod/Drawing/Gui/CMakeLists.txt
+++ b/src/Mod/Drawing/Gui/CMakeLists.txt
@ -5,6 +5,7 @@ else(MSVC)
 endif(MSVC)

 include_directories(
+    ${CMAKE_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/src
    ${CMAKE_CURRENT_BINARY_DIR}
    ${Boost_INCLUDE_DIRS}
--- a/src/Mod/Fem/App/CMakeLists.txt
+++ b/src/Mod/Fem/App/CMakeLists.txt
@ -10,6 +10,7 @@ endif(FREECAD_BUILD_FEM_NETGEN)


 include_directories(
+    ${CMAKE_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/src
    ${CMAKE_BINARY_DIR}/src
    ${CMAKE_CURRENT_BINARY_DIR}
@ -63,14 +64,14 @@ SET(Mod_SRCS
 SOURCE_GROUP("Module" FILES ${Mod_SRCS})

 SET(FemScripts_SRCS
-    convert2TetGen.py
+    convert2TetGen.py
    FemLib.py
-    CalculixLib.py
-    MechanicalAnalysis.ui
-    MechanicalAnalysis.py
-    MechanicalMaterial.ui
-    MechanicalMaterial.py
-    ShowDisplacement.ui
+    CalculixLib.py
+    MechanicalAnalysis.ui
+    MechanicalAnalysis.py
+    MechanicalMaterial.ui
+    MechanicalMaterial.py
+    ShowDisplacement.ui
 )
 #SOURCE_GROUP("Scripts" FILES ${FemScripts_SRCS})

@ -146,14 +147,14 @@ FILE( GLOB Driver_Resources Driver/*.py )
 add_library(Fem SHARED ${Fem_SRCS})
 target_link_libraries(Fem ${Fem_LIBS})

-
-fc_target_copy_resource(Fem 
-    ${CMAKE_SOURCE_DIR}/src/Mod/Fem
-    ${CMAKE_BINARY_DIR}/Mod/Fem
+
+fc_target_copy_resource(Fem 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Fem
+    ${CMAKE_BINARY_DIR}/Mod/Fem
 	${Driver_Resources} 
-	Init.py 
-    ${FemScripts_SRCS}
-    )
+	Init.py 
+    ${FemScripts_SRCS}
+    )

 SET_BIN_DIR(Fem Fem /Mod/Fem)
 SET_PYTHON_PREFIX_SUFFIX(Fem)
--- a/src/Mod/Fem/Gui/CMakeLists.txt
+++ b/src/Mod/Fem/Gui/CMakeLists.txt
@ -9,6 +9,7 @@ if(FREECAD_BUILD_FEM_NETGEN)
 endif(FREECAD_BUILD_FEM_NETGEN)

 include_directories(
+    ${CMAKE_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/src
    ${CMAKE_CURRENT_BINARY_DIR}
    ${Boost_INCLUDE_DIRS}
@ -32,19 +33,19 @@ set(FemGui_LIBS
 )

 generate_from_xml(ViewProviderFemMeshPy)
-
-SET(Python_SRCS
-    ViewProviderFemMeshPy.xml
-    ViewProviderFemMeshPyImp.cpp
-)
+
+SET(Python_SRCS
+    ViewProviderFemMeshPy.xml
+    ViewProviderFemMeshPyImp.cpp
+)
 SOURCE_GROUP("Python" FILES ${Python_SRCS})
-
-
-set(FemGui_MOC_HDRS
-    Hypothesis.h
-    TaskObjectName.h
-    TaskCreateNodeSet.h
-    TaskDlgCreateNodeSet.h
+
+
+set(FemGui_MOC_HDRS
+    Hypothesis.h
+    TaskObjectName.h
+    TaskCreateNodeSet.h
+    TaskDlgCreateNodeSet.h
    TaskFemConstraint.h
    TaskFemConstraintBearing.h
    TaskFemConstraintFixed.h  
@ -56,14 +57,14 @@ set(FemGui_MOC_HDRS
    TaskDriver.h
    TaskDlgAnalysis.h
    TaskDlgMeshShapeNetgen.h
-)
-fc_wrap_cpp(FemGui_MOC_SRCS ${FemGui_MOC_HDRS})
-SOURCE_GROUP("Moc" FILES ${FemGui_MOC_SRCS})
-
-set(FemGui_UIC_SRCS
-    Hypothesis.ui
-    TaskCreateNodeSet.ui
-    TaskObjectName.ui
+)
+fc_wrap_cpp(FemGui_MOC_SRCS ${FemGui_MOC_HDRS})
+SOURCE_GROUP("Moc" FILES ${FemGui_MOC_SRCS})
+
+set(FemGui_UIC_SRCS
+    Hypothesis.ui
+    TaskCreateNodeSet.ui
+    TaskObjectName.ui
    TaskFemConstraint.ui
    TaskFemConstraintBearing.ui
    TaskFemConstraintFixed.ui
@ -71,14 +72,14 @@ set(FemGui_UIC_SRCS
    TaskTetParameter.ui
    TaskAnalysisInfo.ui
    TaskDriver.ui
-)
-qt4_wrap_ui(FemGui_UIC_HDRS ${FemGui_UIC_SRCS})
+)
+qt4_wrap_ui(FemGui_UIC_HDRS ${FemGui_UIC_SRCS})

-SET(FemGui_DLG_SRCS
-    ${FemGui_UIC_HDRS}
-    Hypothesis.ui
-    Hypothesis.cpp
-    Hypothesis.h
+SET(FemGui_DLG_SRCS
+    ${FemGui_UIC_HDRS}
+    Hypothesis.ui
+    Hypothesis.cpp
+    Hypothesis.h
    TaskFemConstraint.ui
    TaskFemConstraint.cpp
    TaskFemConstraint.h
@ -102,7 +103,7 @@ qt4_add_resources(FemResource_SRCS Resources/Fem.qrc)

 SOURCE_GROUP("Resources" FILES ${FemResource_SRCS})

-SET(FemGui_SRCS_ViewProvider
+SET(FemGui_SRCS_ViewProvider
    ViewProviderFemMesh.cpp
    ViewProviderFemMesh.h
    ViewProviderFemMeshShape.cpp
@ -135,16 +136,16 @@ SET(FemGui_SRCS_ViewProvider
    ViewProviderFemConstraintPulley.h
    ViewProviderResult.cpp
    ViewProviderResult.h
-)
-SOURCE_GROUP("ViewProvider" FILES ${FemGui_SRCS_ViewProvider})
+)
+SOURCE_GROUP("ViewProvider" FILES ${FemGui_SRCS_ViewProvider})

-SET(FemGui_SRCS_TaskBoxes
-    TaskObjectName.ui
-    TaskObjectName.cpp
-    TaskObjectName.h
-    TaskCreateNodeSet.ui
-    TaskCreateNodeSet.cpp
-    TaskCreateNodeSet.h
+SET(FemGui_SRCS_TaskBoxes
+    TaskObjectName.ui
+    TaskObjectName.cpp
+    TaskObjectName.h
+    TaskCreateNodeSet.ui
+    TaskCreateNodeSet.cpp
+    TaskCreateNodeSet.h
    TaskDriver.ui
    TaskDriver.cpp
    TaskDriver.h
@ -154,20 +155,20 @@ SET(FemGui_SRCS_TaskBoxes
    TaskTetParameter.ui
    TaskTetParameter.cpp
    TaskTetParameter.h
-)
-SOURCE_GROUP("Task_Boxes" FILES ${FemGui_SRCS_TaskBoxes})
+)
+SOURCE_GROUP("Task_Boxes" FILES ${FemGui_SRCS_TaskBoxes})

-SET(FemGui_SRCS_TaskDlg
-    TaskDlgCreateNodeSet.h
-    TaskDlgCreateNodeSet.cpp
+SET(FemGui_SRCS_TaskDlg
+    TaskDlgCreateNodeSet.h
+    TaskDlgCreateNodeSet.cpp
    TaskDlgMeshShapeNetgen.h
    TaskDlgMeshShapeNetgen.cpp
    TaskDlgAnalysis.h
    TaskDlgAnalysis.cpp
-)
+)
 SOURCE_GROUP("Task_Dialogs" FILES ${FemGui_SRCS_TaskDlg})

-SET(FemGui_SRCS_Module
+SET(FemGui_SRCS_Module
    AppFemGui.cpp
    AppFemGuiPy.cpp
    ActiveAnalysisObserver.cpp
@ -178,7 +179,7 @@ SET(FemGui_SRCS_Module
    PreCompiled.h
    Workbench.cpp
    Workbench.h
-)
+)
 SOURCE_GROUP("Module" FILES ${FemGui_SRCS_Module})

 SET(FemGui_SRCS
@ -200,7 +201,7 @@ fc_target_copy_resource(FemGui
    ${CMAKE_SOURCE_DIR}/src/Mod/Fem
    ${CMAKE_BINARY_DIR}/Mod/Fem
    InitGui.py
-    MechanicalMaterial.ui
+    MechanicalMaterial.ui
    MechanicalAnalysis.ui
    )

--- a/src/Mod/Import/App/CMakeLists.txt
+++ b/src/Mod/Import/App/CMakeLists.txt
@ -6,6 +6,7 @@ endif(MSVC)


 include_directories(
+    ${CMAKE_BINARY_DIR}
    ${CMAKE_CURRENT_BINARY_DIR}
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
--- a/src/Mod/Import/Gui/CMakeLists.txt
+++ b/src/Mod/Import/Gui/CMakeLists.txt
@ -6,6 +6,7 @@ endif(MSVC)


 include_directories(
+    ${CMAKE_BINARY_DIR}
    ${CMAKE_CURRENT_BINARY_DIR}
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
--- a/src/Mod/Inspection/App/CMakeLists.txt
+++ b/src/Mod/Inspection/App/CMakeLists.txt
@ -3,46 +3,47 @@ if(MSVC)
 else(MSVC)
    add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H)
 endif(MSVC)
-
-include_directories(
+
+include_directories(
+    ${CMAKE_BINARY_DIR}
    ${CMAKE_CURRENT_BINARY_DIR}
-	${CMAKE_CURRENT_SOURCE_DIR}
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${Boost_INCLUDE_DIRS}
+    ${OCC_INCLUDE_DIR}
    ${QT_QTCORE_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_PATH}
-    ${ZLIB_INCLUDE_DIR}
-    ${XERCESC_INCLUDE_DIR}
-)
+    ${PYTHON_INCLUDE_PATH}
+    ${ZLIB_INCLUDE_DIR}
+    ${XERCESC_INCLUDE_DIR}
+)

 link_directories(${OCC_LIBRARY_DIR})
-
-set(Inspection_LIBS
-    FreeCADApp
-    Mesh
-    Points
-    Part
-)
-
-SET(Inspection_SRCS
-    AppInspection.cpp
-    AppInspectionPy.cpp
-    InspectionFeature.cpp
-    InspectionFeature.h
-    PreCompiled.cpp
-    PreCompiled.h
-)
-
-add_library(Inspection SHARED ${Inspection_SRCS})
-target_link_libraries(Inspection ${Inspection_LIBS})
-
-
-fc_target_copy_resource(Inspection 
-    ${CMAKE_SOURCE_DIR}/src/Mod/Inspection
-    ${CMAKE_BINARY_DIR}/Mod/Inspection
-    Init.py)
+
+set(Inspection_LIBS
+    FreeCADApp
+    Mesh
+    Points
+    Part
+)
+
+SET(Inspection_SRCS
+    AppInspection.cpp
+    AppInspectionPy.cpp
+    InspectionFeature.cpp
+    InspectionFeature.h
+    PreCompiled.cpp
+    PreCompiled.h
+)
+
+add_library(Inspection SHARED ${Inspection_SRCS})
+target_link_libraries(Inspection ${Inspection_LIBS})
+
+
+fc_target_copy_resource(Inspection 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Inspection
+    ${CMAKE_BINARY_DIR}/Mod/Inspection
+    Init.py)

 SET_BIN_DIR(Inspection Inspection /Mod/Inspection)
-SET_PYTHON_PREFIX_SUFFIX(Inspection)
+SET_PYTHON_PREFIX_SUFFIX(Inspection)

 INSTALL(TARGETS Inspection DESTINATION lib)
--- a/src/Mod/MeshPart/Gui/CMakeLists.txt
+++ b/src/Mod/MeshPart/Gui/CMakeLists.txt
@ -13,6 +13,7 @@ if(FREECAD_BUILD_FEM_NETGEN)
 endif(FREECAD_BUILD_FEM_NETGEN)

 include_directories(
+    ${CMAKE_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/src
    ${CMAKE_CURRENT_BINARY_DIR}
    ${Boost_INCLUDE_DIRS}
--- a/src/Mod/Part/App/CMakeLists.txt
+++ b/src/Mod/Part/App/CMakeLists.txt
@ -9,6 +9,7 @@ if(FREETYPE_FOUND)
 endif(FREETYPE_FOUND)

 include_directories(
+    ${CMAKE_BINARY_DIR}
    ${CMAKE_BINARY_DIR}/src
    ${CMAKE_SOURCE_DIR}/src
    ${CMAKE_CURRENT_BINARY_DIR}
--- a/src/Mod/Part/Gui/CMakeLists.txt
+++ b/src/Mod/Part/Gui/CMakeLists.txt
@ -5,6 +5,7 @@ else(MSVC)
 endif(MSVC)

 include_directories(
+    ${CMAKE_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/src
    ${CMAKE_BINARY_DIR}/src
    ${CMAKE_CURRENT_BINARY_DIR}
--- a/src/Mod/PartDesign/App/CMakeLists.txt
+++ b/src/Mod/PartDesign/App/CMakeLists.txt
@ -5,6 +5,7 @@ else(MSVC)
 endif(MSVC)

 include_directories(
+    ${CMAKE_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/src
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
--- a/src/Mod/PartDesign/Gui/CMakeLists.txt
+++ b/src/Mod/PartDesign/Gui/CMakeLists.txt
@ -5,6 +5,7 @@ else(MSVC)
 endif(MSVC)

 include_directories(
+    ${CMAKE_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/src
    ${CMAKE_CURRENT_BINARY_DIR}
    ${Boost_INCLUDE_DIRS}
--- a/src/Mod/Raytracing/App/CMakeLists.txt
+++ b/src/Mod/Raytracing/App/CMakeLists.txt
@ -5,6 +5,7 @@ else(MSVC)
 endif(MSVC)

 include_directories(
+    ${CMAKE_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/src
    ${CMAKE_CURRENT_BINARY_DIR}
    ${Boost_INCLUDE_DIRS}
--- a/src/Mod/Raytracing/Gui/CMakeLists.txt
+++ b/src/Mod/Raytracing/Gui/CMakeLists.txt
@ -5,6 +5,7 @@ else(MSVC)
 endif(MSVC)

 include_directories(
+    ${CMAKE_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/src
    ${CMAKE_BINARY_DIR}/src
    ${CMAKE_CURRENT_BINARY_DIR}
--- a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
+++ b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
@ -5,6 +5,7 @@ else(MSVC)
 endif(MSVC)

 include_directories(
+    ${CMAKE_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/src
    ${CMAKE_CURRENT_BINARY_DIR}
    ${Boost_INCLUDE_DIRS}
--- a/src/Mod/Robot/App/CMakeLists.txt
+++ b/src/Mod/Robot/App/CMakeLists.txt
@ -6,6 +6,7 @@ endif(MSVC)


 include_directories(
+    ${CMAKE_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/src
    ${CMAKE_BINARY_DIR}/src
    ${CMAKE_CURRENT_BINARY_DIR}
--- a/src/Mod/Robot/Gui/CMakeLists.txt
+++ b/src/Mod/Robot/Gui/CMakeLists.txt
@ -7,6 +7,7 @@ endif(MSVC)


 include_directories(
+    ${CMAKE_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/src
    ${CMAKE_CURRENT_BINARY_DIR}
    ${Boost_INCLUDE_DIRS}
--- a/src/Mod/Sketcher/App/CMakeLists.txt
+++ b/src/Mod/Sketcher/App/CMakeLists.txt
@ -5,6 +5,7 @@ else(MSVC)
 endif(MSVC)

 include_directories(
+    ${CMAKE_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/src
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${CMAKE_CURRENT_BINARY_DIR}
--- a/src/Mod/Sketcher/Gui/CMakeLists.txt
+++ b/src/Mod/Sketcher/Gui/CMakeLists.txt
@ -5,6 +5,7 @@ else(MSVC)
 endif(MSVC)

 include_directories(
+    ${CMAKE_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/src
    ${CMAKE_BINARY_DIR}/src
    ${CMAKE_CURRENT_BINARY_DIR}