Commit d41a15e7 authored by Jan Möbius's avatar Jan Möbius
Browse files

Add the library dir to OpenNi2 and Nite2 finder as well as to the windows fixbundle script.

This should copy the dlls into the windows build folder.



git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17975 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 436d8c6c
......@@ -31,5 +31,5 @@ get_filename_component(_GlutDir "@GLUT_glut_LIBRARY@" PATH)
file (GLOB _plugins "@CMAKE_BINARY_DIR@/Build/Plugins/*.dll")
# fix all dependencies
fixup_bundle ("@CMAKE_BINARY_DIR@/Build/@OPENFLIPPER_PRODUCT_STRING@.exe" "${_plugins}" "${_GlutDir};@Qwt5_Qt4_LIBRARY_DIR@;@GLEW_LIBRARY_DIR@;@QT_BINARY_DIR@;@FTGL_LIBRARY_DIRS@;@FREETYPE_LIBRARY_DIR@;@WINDOWS_COPY_LIBDIRS@")
fixup_bundle ("@CMAKE_BINARY_DIR@/Build/@OPENFLIPPER_PRODUCT_STRING@.exe" "${_plugins}" "${_GlutDir};@Qwt5_Qt4_LIBRARY_DIR@;@GLEW_LIBRARY_DIR@;@QT_BINARY_DIR@;@FTGL_LIBRARY_DIRS@;@FREETYPE_LIBRARY_DIR@;@NITE2_LIBRARY_DIR@;@OPENNI2_LIBRARY_DIR@;@WINDOWS_COPY_LIBDIRS@")
......@@ -33,6 +33,11 @@ else (NITE2_INCLUDE_DIR AND NITE2_LIBRARY)
set(NITE2_INCLUDE_DIRS ${NITE2_INCLUDE_DIR} )
set(NITE2_LIBRARIES ${NITE2_LIBRARY} )
mark_as_advanced(NITE2_INCLUDE_DIR NITE2_LIBRARY)
#sets the library dir
get_filename_component(_NITE2_LIBRARY_DIR ${NITE2_LIBRARY} PATH)
set (NITE2_LIBRARY_DIR "${_NITE2_LIBRARY_DIR}" CACHE PATH "The directory where the Nite2 libraries can be found.")
endif(NITE2_INCLUDE_DIR AND NITE2_LIBRARY)
......
......@@ -33,6 +33,11 @@ else (OPENNI2_INCLUDE_DIR AND OPENNI2_LIBRARY)
set(OPENNI2_INCLUDE_DIRS ${OPENNI2_INCLUDE_DIR} )
set(OPENNI2_LIBRARIES ${OPENNI2_LIBRARY} )
mark_as_advanced(OPENNI2_INCLUDE_DIR OPENNI2_LIBRARY)
#sets the library dir
get_filename_component(_OPENNI2_LIBRARY_DIR ${OPENNI2_LIBRARY} PATH)
set (OPENNI2_LIBRARY_DIR "${_OPENNI2_LIBRARY_DIR}" CACHE PATH "The directory where the OpenNI2 libraries can be found.")
endif(OPENNI2_INCLUDE_DIR AND OPENNI2_LIBRARY)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment