suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ compile with clang

Browse Source
This commit is contained in:
wmayer 2014-05-05 16:24:01 +02:00
parent 213a09c163
commit 3b6d07833d
19 changed files with 114 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ else(MSVC)
endif(MSVC) endif(MSVC)
include_directories( include_directories(
${CMAKE_BINARY_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR} ${OCC_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}

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

@ -5,6 +5,7 @@ else(MSVC)
endif(MSVC) endif(MSVC)
include_directories( include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}

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

@ -10,6 +10,7 @@ endif(FREECAD_BUILD_FEM_NETGEN)
include_directories( include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src
${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
@ -63,14 +64,14 @@ SET(Mod_SRCS
SOURCE_GROUP("Module" FILES ${Mod_SRCS}) SOURCE_GROUP("Module" FILES ${Mod_SRCS})
SET(FemScripts_SRCS SET(FemScripts_SRCS
convert2TetGen.py convert2TetGen.py
FemLib.py FemLib.py
CalculixLib.py CalculixLib.py
MechanicalAnalysis.ui MechanicalAnalysis.ui
MechanicalAnalysis.py MechanicalAnalysis.py
MechanicalMaterial.ui MechanicalMaterial.ui
MechanicalMaterial.py MechanicalMaterial.py
ShowDisplacement.ui ShowDisplacement.ui
) )
#SOURCE_GROUP("Scripts" FILES ${FemScripts_SRCS}) #SOURCE_GROUP("Scripts" FILES ${FemScripts_SRCS})
@ -146,14 +147,14 @@ FILE( GLOB Driver_Resources Driver/*.py )
add_library(Fem SHARED ${Fem_SRCS}) add_library(Fem SHARED ${Fem_SRCS})
target_link_libraries(Fem ${Fem_LIBS}) target_link_libraries(Fem ${Fem_LIBS})
fc_target_copy_resource(Fem fc_target_copy_resource(Fem
${CMAKE_SOURCE_DIR}/src/Mod/Fem ${CMAKE_SOURCE_DIR}/src/Mod/Fem
${CMAKE_BINARY_DIR}/Mod/Fem ${CMAKE_BINARY_DIR}/Mod/Fem
${Driver_Resources} ${Driver_Resources}
Init.py Init.py
${FemScripts_SRCS} ${FemScripts_SRCS}
) )
SET_BIN_DIR(Fem Fem /Mod/Fem) SET_BIN_DIR(Fem Fem /Mod/Fem)
SET_PYTHON_PREFIX_SUFFIX(Fem) SET_PYTHON_PREFIX_SUFFIX(Fem)

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

@ -9,6 +9,7 @@ if(FREECAD_BUILD_FEM_NETGEN)
endif(FREECAD_BUILD_FEM_NETGEN) endif(FREECAD_BUILD_FEM_NETGEN)
include_directories( include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
@ -32,19 +33,19 @@ set(FemGui_LIBS
) )
generate_from_xml(ViewProviderFemMeshPy) generate_from_xml(ViewProviderFemMeshPy)
SET(Python_SRCS SET(Python_SRCS
ViewProviderFemMeshPy.xml ViewProviderFemMeshPy.xml
ViewProviderFemMeshPyImp.cpp ViewProviderFemMeshPyImp.cpp
) )
SOURCE_GROUP("Python" FILES ${Python_SRCS}) SOURCE_GROUP("Python" FILES ${Python_SRCS})
set(FemGui_MOC_HDRS set(FemGui_MOC_HDRS
Hypothesis.h Hypothesis.h
TaskObjectName.h TaskObjectName.h
TaskCreateNodeSet.h TaskCreateNodeSet.h
TaskDlgCreateNodeSet.h TaskDlgCreateNodeSet.h
TaskFemConstraint.h TaskFemConstraint.h
TaskFemConstraintBearing.h TaskFemConstraintBearing.h
TaskFemConstraintFixed.h TaskFemConstraintFixed.h
@ -56,14 +57,14 @@ set(FemGui_MOC_HDRS
TaskDriver.h TaskDriver.h
TaskDlgAnalysis.h TaskDlgAnalysis.h
TaskDlgMeshShapeNetgen.h TaskDlgMeshShapeNetgen.h
) )
fc_wrap_cpp(FemGui_MOC_SRCS ${FemGui_MOC_HDRS}) fc_wrap_cpp(FemGui_MOC_SRCS ${FemGui_MOC_HDRS})
SOURCE_GROUP("Moc" FILES ${FemGui_MOC_SRCS}) SOURCE_GROUP("Moc" FILES ${FemGui_MOC_SRCS})
set(FemGui_UIC_SRCS set(FemGui_UIC_SRCS
Hypothesis.ui Hypothesis.ui
TaskCreateNodeSet.ui TaskCreateNodeSet.ui
TaskObjectName.ui TaskObjectName.ui
TaskFemConstraint.ui TaskFemConstraint.ui
TaskFemConstraintBearing.ui TaskFemConstraintBearing.ui
TaskFemConstraintFixed.ui TaskFemConstraintFixed.ui
@ -71,14 +72,14 @@ set(FemGui_UIC_SRCS
TaskTetParameter.ui TaskTetParameter.ui
TaskAnalysisInfo.ui TaskAnalysisInfo.ui
TaskDriver.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 SET(FemGui_DLG_SRCS
${FemGui_UIC_HDRS} ${FemGui_UIC_HDRS}
Hypothesis.ui Hypothesis.ui
Hypothesis.cpp Hypothesis.cpp
Hypothesis.h Hypothesis.h
TaskFemConstraint.ui TaskFemConstraint.ui
TaskFemConstraint.cpp TaskFemConstraint.cpp
TaskFemConstraint.h TaskFemConstraint.h
@ -102,7 +103,7 @@ qt4_add_resources(FemResource_SRCS Resources/Fem.qrc)
SOURCE_GROUP("Resources" FILES ${FemResource_SRCS}) SOURCE_GROUP("Resources" FILES ${FemResource_SRCS})
SET(FemGui_SRCS_ViewProvider SET(FemGui_SRCS_ViewProvider
ViewProviderFemMesh.cpp ViewProviderFemMesh.cpp
ViewProviderFemMesh.h ViewProviderFemMesh.h
ViewProviderFemMeshShape.cpp ViewProviderFemMeshShape.cpp
@ -135,16 +136,16 @@ SET(FemGui_SRCS_ViewProvider
ViewProviderFemConstraintPulley.h ViewProviderFemConstraintPulley.h
ViewProviderResult.cpp ViewProviderResult.cpp
ViewProviderResult.h ViewProviderResult.h
) )
SOURCE_GROUP("ViewProvider" FILES ${FemGui_SRCS_ViewProvider}) SOURCE_GROUP("ViewProvider" FILES ${FemGui_SRCS_ViewProvider})
SET(FemGui_SRCS_TaskBoxes SET(FemGui_SRCS_TaskBoxes
TaskObjectName.ui TaskObjectName.ui
TaskObjectName.cpp TaskObjectName.cpp
TaskObjectName.h TaskObjectName.h
TaskCreateNodeSet.ui TaskCreateNodeSet.ui
TaskCreateNodeSet.cpp TaskCreateNodeSet.cpp
TaskCreateNodeSet.h TaskCreateNodeSet.h
TaskDriver.ui TaskDriver.ui
TaskDriver.cpp TaskDriver.cpp
TaskDriver.h TaskDriver.h
@ -154,20 +155,20 @@ SET(FemGui_SRCS_TaskBoxes
TaskTetParameter.ui TaskTetParameter.ui
TaskTetParameter.cpp TaskTetParameter.cpp
TaskTetParameter.h TaskTetParameter.h
) )
SOURCE_GROUP("Task_Boxes" FILES ${FemGui_SRCS_TaskBoxes}) SOURCE_GROUP("Task_Boxes" FILES ${FemGui_SRCS_TaskBoxes})
SET(FemGui_SRCS_TaskDlg SET(FemGui_SRCS_TaskDlg
TaskDlgCreateNodeSet.h TaskDlgCreateNodeSet.h
TaskDlgCreateNodeSet.cpp TaskDlgCreateNodeSet.cpp
TaskDlgMeshShapeNetgen.h TaskDlgMeshShapeNetgen.h
TaskDlgMeshShapeNetgen.cpp TaskDlgMeshShapeNetgen.cpp
TaskDlgAnalysis.h TaskDlgAnalysis.h
TaskDlgAnalysis.cpp TaskDlgAnalysis.cpp
) )
SOURCE_GROUP("Task_Dialogs" FILES ${FemGui_SRCS_TaskDlg}) SOURCE_GROUP("Task_Dialogs" FILES ${FemGui_SRCS_TaskDlg})
SET(FemGui_SRCS_Module SET(FemGui_SRCS_Module
AppFemGui.cpp AppFemGui.cpp
AppFemGuiPy.cpp AppFemGuiPy.cpp
ActiveAnalysisObserver.cpp ActiveAnalysisObserver.cpp
@ -178,7 +179,7 @@ SET(FemGui_SRCS_Module
PreCompiled.h PreCompiled.h
Workbench.cpp Workbench.cpp
Workbench.h Workbench.h
) )
SOURCE_GROUP("Module" FILES ${FemGui_SRCS_Module}) SOURCE_GROUP("Module" FILES ${FemGui_SRCS_Module})
SET(FemGui_SRCS SET(FemGui_SRCS
@ -200,7 +201,7 @@ fc_target_copy_resource(FemGui
${CMAKE_SOURCE_DIR}/src/Mod/Fem ${CMAKE_SOURCE_DIR}/src/Mod/Fem
${CMAKE_BINARY_DIR}/Mod/Fem ${CMAKE_BINARY_DIR}/Mod/Fem
InitGui.py InitGui.py
MechanicalMaterial.ui MechanicalMaterial.ui
MechanicalAnalysis.ui MechanicalAnalysis.ui
) )

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

@ -6,6 +6,7 @@ endif(MSVC)
include_directories( include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR} ${OCC_INCLUDE_DIR}

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

@ -6,6 +6,7 @@ endif(MSVC)
include_directories( include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR} ${OCC_INCLUDE_DIR}

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

@ -3,46 +3,47 @@ if(MSVC)
else(MSVC) else(MSVC)
add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H)
endif(MSVC) endif(MSVC)
include_directories( include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR} ${OCC_INCLUDE_DIR}
${QT_QTCORE_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}
${PYTHON_INCLUDE_PATH} ${PYTHON_INCLUDE_PATH}
${ZLIB_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}
${XERCESC_INCLUDE_DIR} ${XERCESC_INCLUDE_DIR}
) )
link_directories(${OCC_LIBRARY_DIR}) link_directories(${OCC_LIBRARY_DIR})
set(Inspection_LIBS set(Inspection_LIBS
FreeCADApp FreeCADApp
Mesh Mesh
Points Points
Part Part
) )
SET(Inspection_SRCS SET(Inspection_SRCS
AppInspection.cpp AppInspection.cpp
AppInspectionPy.cpp AppInspectionPy.cpp
InspectionFeature.cpp InspectionFeature.cpp
InspectionFeature.h InspectionFeature.h
PreCompiled.cpp PreCompiled.cpp
PreCompiled.h PreCompiled.h
) )
add_library(Inspection SHARED ${Inspection_SRCS}) add_library(Inspection SHARED ${Inspection_SRCS})
target_link_libraries(Inspection ${Inspection_LIBS}) target_link_libraries(Inspection ${Inspection_LIBS})
fc_target_copy_resource(Inspection fc_target_copy_resource(Inspection
${CMAKE_SOURCE_DIR}/src/Mod/Inspection ${CMAKE_SOURCE_DIR}/src/Mod/Inspection
${CMAKE_BINARY_DIR}/Mod/Inspection ${CMAKE_BINARY_DIR}/Mod/Inspection
Init.py) Init.py)
SET_BIN_DIR(Inspection Inspection /Mod/Inspection) SET_BIN_DIR(Inspection Inspection /Mod/Inspection)
SET_PYTHON_PREFIX_SUFFIX(Inspection) SET_PYTHON_PREFIX_SUFFIX(Inspection)
INSTALL(TARGETS Inspection DESTINATION lib) INSTALL(TARGETS Inspection DESTINATION lib)

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

@ -13,6 +13,7 @@ if(FREECAD_BUILD_FEM_NETGEN)
endif(FREECAD_BUILD_FEM_NETGEN) endif(FREECAD_BUILD_FEM_NETGEN)
include_directories( include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}

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

@ -9,6 +9,7 @@ if(FREETYPE_FOUND)
endif(FREETYPE_FOUND) endif(FREETYPE_FOUND)
include_directories( include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}

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

@ -5,6 +5,7 @@ else(MSVC)
endif(MSVC) endif(MSVC)
include_directories( include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src
${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}

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

@ -5,6 +5,7 @@ else(MSVC)
endif(MSVC) endif(MSVC)
include_directories( include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR} ${OCC_INCLUDE_DIR}

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

@ -5,6 +5,7 @@ else(MSVC)
endif(MSVC) endif(MSVC)
include_directories( include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}

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

@ -5,6 +5,7 @@ else(MSVC)
endif(MSVC) endif(MSVC)
include_directories( include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}

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

@ -5,6 +5,7 @@ else(MSVC)
endif(MSVC) endif(MSVC)
include_directories( include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src
${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}

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

@ -5,6 +5,7 @@ else(MSVC)
endif(MSVC) endif(MSVC)
include_directories( include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}

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

@ -6,6 +6,7 @@ endif(MSVC)
include_directories( include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src
${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}

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

@ -7,6 +7,7 @@ endif(MSVC)
include_directories( include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}

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

@ -5,6 +5,7 @@ else(MSVC)
endif(MSVC) endif(MSVC)
include_directories( include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}

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

@ -5,6 +5,7 @@ else(MSVC)
endif(MSVC) endif(MSVC)
include_directories( include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src
${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}