From 671d8dc3420312a43fddf0f3e7951196c0625e95 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 21 Nov 2014 20:16:16 +0000 Subject: [PATCH] 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 --- src/osgDB/CMakeLists.txt | 2 +- src/osgDB/FileUtils.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osgDB/CMakeLists.txt b/src/osgDB/CMakeLists.txt index 018a74ba4..cb6e46fd1 100644 --- a/src/osgDB/CMakeLists.txt +++ b/src/osgDB/CMakeLists.txt @@ -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. diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp index 1c3e4bc0e..e8d9651f6 100644 --- a/src/osgDB/FileUtils.cpp +++ b/src/osgDB/FileUtils.cpp @@ -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 }