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

+ simplify dependencies in CMakeLists.txt files

Browse Source
This commit is contained in:
wmayer 2015-07-17 12:18:44 +02:00
parent 74e397c869
commit 1b58ec8bb7
3 changed files with 15 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/App/CMakeLists.txt
View File

@ -23,19 +23,11 @@ include_directories(
${ZLIB_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}
) )
if(WIN32) set(FreeCADApp_LIBS
set(FreeCADApp_LIBS FreeCADBase
FreeCADBase ${Boost_LIBRARIES}
${Boost_LIBRARIES} ${QT_LIBRARIES}
${QT_LIBRARIES} )
)
else(WIN32)
set(FreeCADApp_LIBS
FreeCADBase
${Boost_LIBRARIES}
${QT_LIBRARIES}
)
endif(WIN32)
generate_from_xml(DocumentPy) generate_from_xml(DocumentPy)
generate_from_xml(DocumentObjectPy) generate_from_xml(DocumentObjectPy)

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

@ -20,20 +20,12 @@ include_directories(
) )
link_directories(${OCC_LIBRARY_DIR}) link_directories(${OCC_LIBRARY_DIR})
if(MSVC) set(Path_LIBS
set(Path_LIBS Robot
Robot Part
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
FreeCADApp FreeCADApp
) )
else(MSVC)
set(Path_LIBS
Robot
Part
${QT_QTCORE_LIBRARY}
FreeCADApp
)
endif(MSVC)
generate_from_xml(CommandPy) generate_from_xml(CommandPy)
generate_from_xml(PathPy) generate_from_xml(PathPy)

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

@ -9,17 +9,10 @@ include_directories(
${QT_INCLUDE_DIR} ${QT_INCLUDE_DIR}
) )
if(MSVC) set(Web_LIBS
set(Web_LIBS FreeCADApp
FreeCADApp ${QT_LIBRARIES}
${QT_LIBRARIES} )
)
else(MSVC)
set(Web_LIBS
FreeCADApp
${QT_LIBRARIES}
)
endif(MSVC)
set(Web_MOC_HDRS set(Web_MOC_HDRS
Server.h Server.h