William A. Hoffman wrote:
> The more general solution is to put the directories in CMake
> in Modules/Platform/UnixPaths.cmake. Then all the FIND stuff in
> cmake will use them.
>
> If you could try it and make sure it works, I can commit the changes
> you make to cmake.
Patch attached. Note that actually very few platforms include UnixPaths.
Maybe it's good idea to include it for other *BSD platforms and all
commercial unixes as well? ;)
--
Hasso Tepper
KDE Estonian Team
Index: Modules/Platform/NetBSD.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/NetBSD.cmake,v
retrieving revision 1.5
diff -u -3 -p -r1.5 NetBSD.cmake
--- Modules/Platform/NetBSD.cmake 22 Sep 2004 18:42:05 -0000 1.5
+++ Modules/Platform/NetBSD.cmake 27 Mar 2006 13:26:22 -0000
@@ -6,3 +6,4 @@ IF(EXISTS /usr/include/dlfcn.h)
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") # -rpath
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") # : or empty
ENDIF(EXISTS /usr/include/dlfcn.h)
+INCLUDE(Platform/UnixPaths)
Index: Modules/Platform/UnixPaths.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/UnixPaths.cmake,v
retrieving revision 1.2
diff -u -3 -p -r1.2 UnixPaths.cmake
--- Modules/Platform/UnixPaths.cmake 24 Mar 2006 19:15:10 -0000 1.2
+++ Modules/Platform/UnixPaths.cmake 27 Mar 2006 13:26:22 -0000
@@ -1,5 +1,6 @@
SET(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH} /usr/include
- /usr/local/include /usr/local /usr/X11R6/include /usr/include/X11)
+ /usr/local/include /usr/local /usr/X11R6/include /usr/include/X11 /usr/pkg/include)
SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} /lib /usr/lib /usr/local/lib
- /usr/lib/w32api /usr/X11R6/lib /opt/local/lib /opt/csw/lib /opt/lib )
-SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH} /bin /usr/bin /usr/local/bin /sbin)
+ /usr/lib/w32api /usr/X11R6/lib /opt/local/lib /opt/csw/lib /opt/lib /usr/pkg/lib)
+SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH} /bin /usr/bin /usr/local/bin
+ /usr/pkg/bin /sbin)
_______________________________________________
Kde-buildsystem mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-buildsystem
