From 1b58ec8bb7d83e96d7511dfdcf9e2a8532a272c8 Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 17 Jul 2015 12:18:44 +0200 Subject: [PATCH] + simplify dependencies in CMakeLists.txt files --- src/App/CMakeLists.txt | 18 +++++------------- src/Mod/Path/App/CMakeLists.txt | 20 ++++++-------------- src/Mod/Web/App/CMakeLists.txt | 15 ++++----------- 3 files changed, 15 insertions(+), 38 deletions(-) diff --git a/src/App/CMakeLists.txt b/src/App/CMakeLists.txt index c89a8d07d210..2d653dec3dee 100644 --- a/src/App/CMakeLists.txt +++ b/src/App/CMakeLists.txt @@ -23,19 +23,11 @@ include_directories( ${ZLIB_INCLUDE_DIR} ) -if(WIN32) - set(FreeCADApp_LIBS - FreeCADBase - ${Boost_LIBRARIES} - ${QT_LIBRARIES} - ) -else(WIN32) - set(FreeCADApp_LIBS - FreeCADBase - ${Boost_LIBRARIES} - ${QT_LIBRARIES} - ) -endif(WIN32) +set(FreeCADApp_LIBS + FreeCADBase + ${Boost_LIBRARIES} + ${QT_LIBRARIES} +) generate_from_xml(DocumentPy) generate_from_xml(DocumentObjectPy) diff --git a/src/Mod/Path/App/CMakeLists.txt b/src/Mod/Path/App/CMakeLists.txt index f082333b3301..33cdd77c59db 100644 --- a/src/Mod/Path/App/CMakeLists.txt +++ b/src/Mod/Path/App/CMakeLists.txt @@ -20,20 +20,12 @@ include_directories( ) link_directories(${OCC_LIBRARY_DIR}) -if(MSVC) - set(Path_LIBS - Robot - ${QT_QTCORE_LIBRARY} - FreeCADApp - ) -else(MSVC) - set(Path_LIBS - Robot - Part - ${QT_QTCORE_LIBRARY} - FreeCADApp - ) -endif(MSVC) +set(Path_LIBS + Robot + Part + ${QT_QTCORE_LIBRARY} + FreeCADApp +) generate_from_xml(CommandPy) generate_from_xml(PathPy) diff --git a/src/Mod/Web/App/CMakeLists.txt b/src/Mod/Web/App/CMakeLists.txt index d08121e788b3..edb02475fd33 100644 --- a/src/Mod/Web/App/CMakeLists.txt +++ b/src/Mod/Web/App/CMakeLists.txt @@ -9,17 +9,10 @@ include_directories( ${QT_INCLUDE_DIR} ) -if(MSVC) - set(Web_LIBS - FreeCADApp - ${QT_LIBRARIES} - ) -else(MSVC) - set(Web_LIBS - FreeCADApp - ${QT_LIBRARIES} - ) -endif(MSVC) +set(Web_LIBS + FreeCADApp + ${QT_LIBRARIES} +) set(Web_MOC_HDRS Server.h