Changed OpenMesh directory structure
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@105 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
@@ -23,10 +23,16 @@ defineTest( glut ) {
|
||||
}
|
||||
|
||||
defineTest( openmesh ) {
|
||||
QMAKE_LIBDIR += $${TOPDIR}/OpenMesh/Tools/lib/$${BUILDDIRECTORY}
|
||||
QMAKE_LIBDIR += $${TOPDIR}/OpenMesh/Core/lib/$${BUILDDIRECTORY}
|
||||
LIBS += -lTools
|
||||
LIBS += -lCore
|
||||
QMAKE_LIBDIR += $${TOPDIR}/lib/$${BUILDDIRECTORY}
|
||||
QMAKE_LIBDIR += $${TOPDIR}/lib/$${BUILDDIRECTORY}
|
||||
|
||||
CONFIG( debug, debug|release ){
|
||||
LIBS += -lOpenMeshToolsd
|
||||
LIBS += -lOpenMeshCored
|
||||
} else {
|
||||
LIBS += -lOpenMeshTools
|
||||
LIBS += -lOpenMeshCore
|
||||
}
|
||||
export(QMAKE_LIBDIR)
|
||||
export(LIBS)
|
||||
}
|
||||
|
||||
@@ -32,10 +32,17 @@ defineTest( glut ) {
|
||||
}
|
||||
|
||||
defineTest( openmesh ) {
|
||||
QMAKE_LIBDIR += $${TOPDIR}/OpenMesh/Core/lib/$${BUILDDIRECTORY}
|
||||
QMAKE_LIBDIR += $${TOPDIR}/OpenMesh/Tools/lib/$${BUILDDIRECTORY}
|
||||
LIBS+= -Wl,-rpath=$${TOPDIR}/OpenMesh/Core/lib/$${BUILDDIRECTORY} -lCore
|
||||
LIBS+= -Wl,-rpath=$${TOPDIR}/OpenMesh/Tools/lib/$${BUILDDIRECTORY} -lTools
|
||||
QMAKE_LIBDIR += $${TOPDIR}/lib/
|
||||
QMAKE_LIBDIR += $${TOPDIR}/lib/
|
||||
|
||||
CONFIG( debug, debug|release ){
|
||||
LIBS+= -Wl,-rpath=$${TOPDIR}/lib -lOpenMeshCored
|
||||
LIBS+= -Wl,-rpath=$${TOPDIR}/lib -lOpenMeshToolsd
|
||||
} else {
|
||||
LIBS+= -Wl,-rpath=$${TOPDIR}/lib -lOpenMeshCore
|
||||
LIBS+= -Wl,-rpath=$${TOPDIR}/lib -lOpenMeshTools
|
||||
}
|
||||
|
||||
export(QMAKE_LIBDIR)
|
||||
export(LIBS)
|
||||
}
|
||||
|
||||
@@ -58,9 +58,18 @@ defineTest( openmp ) {
|
||||
|
||||
defineTest( openmesh ) {
|
||||
DEFINES += _USE_MATH_DEFINES NOMINMAX
|
||||
QMAKE_LIBDIR += $${TOPDIR}/OpenMesh/Core/lib/$${BUILDDIRECTORY}
|
||||
LIBS+= -L$${TOPDIR}/OpenMesh/Core/lib/$${BUILDDIRECTORY} -lCore
|
||||
LIBS+= -L$${TOPDIR}/OpenMesh/Tools/lib/$${BUILDDIRECTORY} -lTools
|
||||
|
||||
QMAKE_LIBDIR += $${TOPDIR}/lib/
|
||||
QMAKE_LIBDIR += $${TOPDIR}/lib/
|
||||
|
||||
CONFIG( debug, debug|release ){
|
||||
LIBS+= -L$${TOPDIR}/lib -lOpenMeshCored
|
||||
LIBS+= -L$${TOPDIR}/lib -lOpenMeshToolsd
|
||||
} else {
|
||||
LIBS+= -L$${TOPDIR}/lib -lOpenMeshCore
|
||||
LIBS+= -L$${TOPDIR}/lib -lOpenMeshTools
|
||||
}
|
||||
|
||||
export(DEFINES)
|
||||
export(QMAKE_LIBDIR)
|
||||
export(LIBS)
|
||||
|
||||
Reference in New Issue
Block a user