From Alberto Luaces,"the current code uses the preprocessor for generating the plugin path in
a way that when CMAKE_INSTALL_PREFIX contains something along the lines of /usr/x86_64-linux-gnu/ it gets substituted as /usr/x86_64-1-gnu/ that is, the string is preprocessed again, thereby making changes to anything that matches any defined symbol, as "linux" in this example (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763816). Quoting that path directly in CMake scripts solves that problem. " git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14522 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
parent
a97f104ab6
commit
671d8dc342
@ -7,7 +7,7 @@ IF (DYNAMIC_OPENSCENEGRAPH)
|
||||
|
||||
IF(OSG_PLUGIN_SEARCH_INSTALL_DIR_FOR_PLUGINS)
|
||||
# Add a default plugin search path component
|
||||
ADD_DEFINITIONS(-DOSG_DEFAULT_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX}/${OSG_PLUGINS})
|
||||
ADD_DEFINITIONS(-DOSG_DEFAULT_LIBRARY_PATH=\"${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX}/${OSG_PLUGINS}\")
|
||||
ENDIF()
|
||||
|
||||
# Set the library extension according to what configuration is being built.
|
||||
|
@ -510,7 +510,7 @@ static void appendInstallationLibraryFilePaths(osgDB::FilePathList& filepath)
|
||||
#ifdef OSG_DEFAULT_LIBRARY_PATH
|
||||
|
||||
// Append the install prefix path to the library search path if configured
|
||||
filepath.push_back(ADDQUOTES(OSG_DEFAULT_LIBRARY_PATH));
|
||||
filepath.push_back(OSG_DEFAULT_LIBRARY_PATH);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user