+ simplify dependencies in CMakeLists.txt files

FreeCAD · Jul 17, 2015 · 1b58ec8 · 1b58ec8
1 parent 74e397c
commit 1b58ec8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 38 deletions.
diff --git 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
@@ -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
@@ -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