+ use variables instead of hard-coded library names

FreeCAD · Jul 17, 2015 · 36249a6 · 36249a6
1 parent 1b58ec8
commit 36249a6
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 7 deletions.
diff --git a/cMake/UseLibPack10x.cmake b/cMake/UseLibPack10x.cmake
@@ -131,10 +131,22 @@ set(QT_QTCORE_LIBRARY
     optimized QtCore4.lib debug QtCored4.lib
 )
 
+set(QT_QTXML_LIBRARY 
+    optimized QtXml4.lib debug QtXmld4.lib
+)
+
 set(QT_QT3SUPPORT_LIBRARY 
     optimized Qt3Support4.lib debug Qt3Supportd4.lib
 )
 
+set(QT_QTUITOOLS_LIBRARY 
+    optimized QtUiTools.lib debug QtUiToolsd.lib
+)
+
+set(QT_QTMAIN_LIBRARY 
+    debug qtmaind.lib optimized qtmain.lib
+)
+
 set(QT_UIC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/uic.exe)
 set(QT_MOC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/moc.exe)
 set(QT_RCC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/rcc.exe)

diff --git a/cMake/UseLibPack6x.cmake b/cMake/UseLibPack6x.cmake
@@ -116,6 +116,21 @@ set(QT_QTCORE_LIBRARY
     debug QtCored4.lib
 )
 
+set(QT_QTXML_LIBRARY 
+    optimized QtXml4.lib
+    debug QtXmld4.lib
+)
+
+set(QT_QTUITOOLS_LIBRARY 
+    optimized QtUiTools.lib
+    debug QtUiToolsd.lib
+)
+
+set(QT_QTMAIN_LIBRARY 
+    debug qtmaind.lib
+    optimized qtmain.lib
+)
+
 set(QT_UIC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/uic.exe)
 set(QT_MOC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/moc.exe)
 set(QT_RCC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/rcc.exe)

diff --git a/cMake/UseLibPack7x.cmake b/cMake/UseLibPack7x.cmake
@@ -125,6 +125,21 @@ set(QT_QTCORE_LIBRARY
     debug QtCored4.lib
 )
 
+set(QT_QTXML_LIBRARY 
+    optimized QtXml4.lib
+    debug QtXmld4.lib
+)
+
+set(QT_QTUITOOLS_LIBRARY 
+    optimized QtUiTools.lib
+    debug QtUiToolsd.lib
+)
+
+set(QT_QTMAIN_LIBRARY 
+    debug qtmaind.lib
+    optimized qtmain.lib
+)
+
 set(QT_UIC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/uic.exe)
 set(QT_MOC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/moc.exe)
 set(QT_RCC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/rcc.exe)

diff --git a/cMake/UseLibPack8x.cmake b/cMake/UseLibPack8x.cmake
@@ -137,6 +137,21 @@ set(QT_QTCORE_LIBRARY
     debug QtCored4.lib
 )
 
+set(QT_QTXML_LIBRARY 
+    optimized QtXml4.lib
+    debug QtXmld4.lib
+)
+
+set(QT_QTUITOOLS_LIBRARY 
+    optimized QtUiTools.lib
+    debug QtUiToolsd.lib
+)
+
+set(QT_QTMAIN_LIBRARY 
+    debug qtmaind.lib
+    optimized qtmain.lib
+)
+
 set(QT_UIC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/uic.exe)
 set(QT_MOC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/moc.exe)
 set(QT_RCC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/rcc.exe)

diff --git a/cMake/UseLibPack9x.cmake b/cMake/UseLibPack9x.cmake
@@ -154,6 +154,16 @@ set(QT_QT3SUPPORT_LIBRARY
     debug Qt3Supportd4.lib
 )
 
+set(QT_QTUITOOLS_LIBRARY 
+    optimized QtUiTools.lib
+    debug QtUiToolsd.lib
+)
+
+set(QT_QTMAIN_LIBRARY 
+    debug qtmaind.lib
+    optimized qtmain.lib
+)
+
 set(QT_UIC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/uic.exe)
 set(QT_MOC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/moc.exe)
 set(QT_RCC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/rcc.exe)

diff --git a/cMake/UseLibPackCustom.cmake b/cMake/UseLibPackCustom.cmake
@@ -150,6 +150,16 @@ set(QT_QT3SUPPORT_LIBRARY
     debug Qt3Supportd4.lib
 )
 
+set(QT_QTUITOOLS_LIBRARY 
+    optimized QtUiTools.lib
+    debug QtUiToolsd.lib
+)
+
+set(QT_QTMAIN_LIBRARY 
+    debug qtmaind.lib
+    optimized qtmain.lib
+)
+
 set(QT_UIC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/uic.exe)
 set(QT_MOC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/moc.exe)
 set(QT_RCC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/rcc.exe)

diff --git a/src/App/CMakeLists.txt b/src/App/CMakeLists.txt
@@ -26,7 +26,8 @@ include_directories(
 set(FreeCADApp_LIBS
     FreeCADBase
     ${Boost_LIBRARIES}
-    ${QT_LIBRARIES}
+    ${QT_QTCORE_LIBRARY}
+    ${QT_QTXML_LIBRARY}
 )
 
 generate_from_xml(DocumentPy)

diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt
@@ -45,8 +45,7 @@ if(MSVC)
          debug ${COIN3D_LIBRARY_DEBUG}
          optimized ${COIN3D_LIBRARY_RELEASE}
          ${QT_LIBRARIES}
-         optimized QtUiTools.lib
-         debug QtUiToolsd.lib
+         ${QT_QTUITOOLS_LIBRARY}
          ${OPENGL_gl_LIBRARY}
     )
 else(MSVC)

diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
@@ -32,8 +32,7 @@ if(BUILD_GUI)
     if(MSVC)
         SET(FreeCAD_LIBS
             FreeCADGui
-            debug qtmaind.lib
-            optimized qtmain.lib
+            ${QT_QTMAIN_LIBRARY}
         )
     else(MSVC)
         SET(FreeCAD_LIBS
@@ -66,7 +65,8 @@ add_executable(FreeCADMainCmd ${FreeCADMainCmd_SRCS})
 
 target_link_libraries(FreeCADMainCmd 
     FreeCADApp
-    ${QT_LIBRARIES}
+    ${QT_QTCORE_LIBRARY}
+    ${QT_QTXML_LIBRARY}
 )
 
 SET_BIN_DIR(FreeCADMainCmd FreeCADCmd)
@@ -85,7 +85,7 @@ endif(WIN32)
 ######################## FreeCADMainPy ########################
 
 SET(FreeCADMainPy_SRCS
-     MainPy.cpp
+    MainPy.cpp
 )
 
 add_library(FreeCADMainPy SHARED ${FreeCADMainPy_SRCS})