[BACK]Return to patch-aa CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / devel / cmake / patches

File: [cvs.NetBSD.org] / pkgsrc / devel / cmake / patches / patch-aa (download)

Revision 1.10, Thu Nov 15 19:31:55 2012 UTC (23 months, 1 week ago) by adam
Branch: MAIN
CVS Tags: pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2, pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, HEAD
Changes since 1.9: +8 -8 lines

With the 2.8.10 release, users now have a new way to arrange exported targets that depend on other targets into "export sets." In addition, there are new target properties for PDB_OUTPUT_DIRECTORY and PDB_NAME implemented for Visual Studio 7 and later.

Generator expressions, which are used to introduce conditional statements at generate time rather than at CMake compile time, are now available in more contexts, notably in the INCLUDE_DIRECTORIES and COMPILE_DEFINITIONS target properties. There are also new generator expressions available in the 2.8.10 release.

The file(DOWNLOAD command can accommodate https URLs. The pre-built binaries for this are available from Kitware and link to OpenSSL. The team has also added uniform compiler "id" and version number variables available for nearly all known compilers and platforms.

$NetBSD: patch-aa,v 1.10 2012/11/15 19:31:55 adam Exp $

Patch in pkgsrc paths for finding stuff.

--- Modules/Platform/UnixPaths.cmake.orig	2012-10-31 15:32:05.000000000 +0000
+++ Modules/Platform/UnixPaths.cmake
@@ -48,10 +48,10 @@ list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
   /usr/include/w32api
 
   # X11
-  /usr/X11R6/include /usr/include/X11
+  @X11BASE@/include /usr/X11R6/include /usr/include/X11
 
   # Other
-  /usr/pkg/include
+  @LOCALBASE@/include
   /opt/csw/include /opt/include
   /usr/openwin/include
   )
@@ -61,16 +61,16 @@ list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
   /usr/lib/w32api
 
   # X11
-  /usr/X11R6/lib /usr/lib/X11
+  @X11BASE@/lib /usr/X11R6/lib /usr/lib/X11
 
   # Other
-  /usr/pkg/lib
+  @LOCALBASE@/lib
   /opt/csw/lib /opt/lib
   /usr/openwin/lib
   )
 
 list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
-  /usr/pkg/bin
+  @LOCALBASE@/bin
   )
 
 list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES