public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some setup-hooks with new syntax; pkgconfig upgraded to 0.22

Browse Source 
svn path=/nixpkgs/trunk/; revision=9645
This commit is contained in:
Yury G. Kudryashov
2007-11-11 20:32:43 +00:00
parent bfe435ebaf
commit 16b44ea14d
7 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/build-managers/cmake/setup-hook.sh
+8 -7
View File
@@ -1,15 +1,16 @@
addCMakeParamsInclude()
{
if [ -d $1/include ]; then
export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}${CMAKE_INCLUDE_PATH:+:}$1/include"
fi
addToSearchPath CMAKE_INCLUDE_PATH /include "" $1
}
addCMakeParamsLibs()
{
if [ -d $1/lib ]; then
export CMAKE_LIBRARY_PATH="${CMAKE_LIBRARY_PATH}${CMAKE_LIBRARY_PATH:+:}$1/lib"
fi
addToSearchPath CMAKE_LIBRARY_PATH /lib "" $1
}
addCMakeModulePath()
{
addToSearchPath CMAKE_MODULE_PATH /share/cmake-2.4/Modules "" $1
}
fixCmakeFiles()
@@ -45,4 +46,4 @@ if [ -z "$noCmakeTewaks" ]; then
postUnpack="cmakePostUnpack${postUnpack:+; }${postUnpack}"
fi;
envHooks=(${envHooks[@]} addCMakeParamsInclude addCMakeParamsLibs)
envHooks=(${envHooks[@]} addCMakeParamsInclude addCMakeParamsLibs addCMakeModulePath)