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

+ use variables instead of hard-coded library names

Browse Source
This commit is contained in:
wmayer 2015-07-17 14:54:02 +02:00
parent 1b58ec8bb7
commit 36249a64ce
9 changed files with 84 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cMake/UseLibPack10x.cmake
View File

@ -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)

15
cMake/UseLibPack6x.cmake
View File

@ -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)

15
cMake/UseLibPack7x.cmake
View File

@ -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)

15
cMake/UseLibPack8x.cmake
View File

@ -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)

10
cMake/UseLibPack9x.cmake
View File

@ -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)

10
cMake/UseLibPackCustom.cmake
View File

@ -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)

3
src/App/CMakeLists.txt
View File

@ -26,7 +26,8 @@ include_directories(
set(FreeCADApp_LIBS
FreeCADBase
${Boost_LIBRARIES}
${QT_LIBRARIES}
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
)
generate_from_xml(DocumentPy)

3
src/Gui/CMakeLists.txt
View File

@ -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)

8
src/Main/CMakeLists.txt
View File

@ -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})