diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-02-12 21:58:27 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-02-12 21:58:27 +0000 |
| commit | e0ff817c4071bdd1b4b8bc003110fd2b75c14e7a (patch) | |
| tree | 39bbeaa203b4a596c63343f5f3acd44463660df9 /pkgs/development/tools/build-managers | |
| parent | 333dfb869e3f3592a81fbda3b5b681a0e44b1bf2 (diff) | |
Big kde-related update.
I updated cmake to use CMAKE_PREFIX_PATH instead of CMAKE_INCLUDE_PATH and CMAKE_LIBRARY_PATH. There were some expressions in kde that required CMAKE_PREFIX_PATH, and now they are not anymore a special case. I updated most kde-4.4 files to point to kde-4.4.0 sources instead of 4.3.4 . svn path=/nixpkgs/trunk/; revision=19965
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rwxr-xr-x | pkgs/development/tools/build-managers/cmake/setup-hook.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 892af7735187d..49a4ad7fd90da 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -1,7 +1,6 @@ addCMakeParams() { - addToSearchPath CMAKE_INCLUDE_PATH $1/include - addToSearchPath CMAKE_LIBRARY_PATH $1/lib + addToSearchPath CMAKE_PREFIX_PATH $1 addToSearchPath CMAKE_MODULE_PATH $1/share/cmake-@majorVersion@/Modules } |