Przeglądaj źródła

BUGFIX: Use the correct path for the file assimp.pc.in ( thanks to Roman Kharitonov ).

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@925 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
kimmi 14 lat temu
rodzic
commit
5f10c38baa
2 zmienionych plików z 4 dodań i 4 usunięć
  1. 2 2
      CMakeLists.txt
  2. 2 2
      code/Q3BSPFileImporter.cpp

+ 2 - 2
CMakeLists.txt

@@ -22,8 +22,8 @@ SET( BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH
 	"Path the tool executables are installed to." )
 
 # Generate a pkg-config .pc for the Assimp library.
-CONFIGURE_FILE( "${CMAKE_SOURCE_DIR}/assimp.pc.in" "${CMAKE_BINARY_DIR}/assimp.pc" @ONLY )
-INSTALL( FILES "${CMAKE_BINARY_DIR}/assimp.pc" DESTINATION ${LIB_INSTALL_DIR}/pkgconfig/ )
+CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/assimp.pc.in" "${PROJECT_BINARY_DIR}/assimp.pc" @ONLY )
+INSTALL( FILES "${PROJECT_BINARY_DIR}/assimp.pc" DESTINATION ${LIB_INSTALL_DIR}/pkgconfig/ )
 
 # Globally enbale Boost resp. the Boost workaround – it is also needed by the
 # tools which include the Assimp headers.

+ 2 - 2
code/Q3BSPFileImporter.cpp

@@ -62,10 +62,10 @@ namespace Assimp
 
 using namespace Q3BSP;
 
-static const std::string Q3BSPExtention = "pk3";
+static const std::string Q3BSPExtension = "pk3";
 
 // ------------------------------------------------------------------------------------------------
-//	Local fnction to create a material keyname.
+//	Local function to create a material key name.
 static void createKey( int id1, int id2, std::string &rKey )
 {
 	std::stringstream str;