+ use variables instead of hard-coded library names
This commit is contained in:
@@ -26,7 +26,8 @@ include_directories(
|
||||
set(FreeCADApp_LIBS
|
||||
FreeCADBase
|
||||
${Boost_LIBRARIES}
|
||||
${QT_LIBRARIES}
|
||||
${QT_QTCORE_LIBRARY}
|
||||
${QT_QTXML_LIBRARY}
|
||||
)
|
||||
|
||||
generate_from_xml(DocumentPy)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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})
|
||||
|
||||
Reference in New Issue
Block a user