Re-Revert "Merge pull request #567 from MarcWeber/submit/cmake-improvement"

This reverts commit b08e12b37a.
2013-06-27 15:14:32 +02:00
parent 83ec7aa92f
commit 7f1e09c35d
4 changed files with 62 additions and 37 deletions
@@ -56,3 +56,20 @@ if [ -n "$crossConfig" ]; then
 else
    envHooks+=(addCMakeParams)
 fi
+
+make_cmake_find_libs(){
+  for flag in $NIX_CFLAGS_COMPILE $NIX_LDFLAGS; do
+    case $flag in
+      -I*)
+        export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH${CMAKE_INCLUDE_PATH:+:}${flag:2}"
+        ;;
+      -L*)
+        export CMAKE_LIBRARY_PATH="$CMAKE_LIBRARY_PATH${CMAKE_LIBRARY_PATH:+:}${flag:2}"
+        ;;
+    esac
+  done
+}
+
+# not using setupHook, because it could be a setupHook adding additional
+# include flags to NIX_CFLAGS_COMPILE
+postHooks+=(make_cmake_find_libs)