plplot-cvs

[Plplot-cvs] SF.net SVN: plplot:[12440] trunk/cmake/build_projects/template.bp.in

[<ai...@us...>]

Revision: 12440
          http://sourceforge.net/p/plplot/code/12440
Author:   airwin
Date:     2013-07-29 17:37:32 +0000 (Mon, 29 Jul 2013)
Log Message:
-----------
Add template for handling extra CFLAGS.

Modified Paths:
--------------
    trunk/cmake/build_projects/template.bp.in

Modified: trunk/cmake/build_projects/template.bp.in
===================================================================
--- trunk/cmake/build_projects/template.bp.in	2013-07-28 04:22:21 UTC (rev 12439)
+++ trunk/cmake/build_projects/template.bp.in	2013-07-29 17:37:32 UTC (rev 12440)
@@ -56,8 +56,10 @@
   determine_msys_path(BP_PATH "${BP_PATH}")
   # Must have all elements of env command in MSYS platform form
   determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=@MSYS_EXTRA_CFLAGS@$ENV{CFLAGS}")
 else(MSYS_PLATFORM)
   set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=@UNIX_EXTRA_CFLAGS@$ENV{CFLAGS}")
 endif(MSYS_PLATFORM)
 #message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
 
@@ -66,7 +68,7 @@
   DEPENDS ${${BP_PACKAGE}_dependencies_targets}
   URL ${${BP_PACKAGE}_URL}
   URL_HASH ${${BP_PACKAGE}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}_DOWNLOAD_HASH}
-  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${source_PATH}/${BP_CONFIGURE_COMMAND} 
+  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} 
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND}
   INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} install
   )

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12471] trunk/cmake/build_projects/template.bp.in

[<ai...@us...>]

Revision: 12471
          http://sourceforge.net/p/plplot/code/12471
Author:   airwin
Date:     2013-08-04 17:50:42 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
Insert boiler-plate warning into generated */bp.cmake files that those
files are generated.

Implement use of extra_ignored_dependencies_list (which allows
platforms to selectively ignore certain dependencies).

Modified Paths:
--------------
    trunk/cmake/build_projects/template.bp.in

Modified: trunk/cmake/build_projects/template.bp.in
===================================================================
--- trunk/cmake/build_projects/template.bp.in	2013-08-04 17:50:07 UTC (rev 12470)
+++ trunk/cmake/build_projects/template.bp.in	2013-08-04 17:50:42 UTC (rev 12471)
@@ -1,4 +1,11 @@
 # @package@/bp.cmake
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts).  If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts).
+
 # This file should be included directly or indirectly from a top-level
 # CMakeLists.txt file to configure the build of @package@.
 
@@ -32,7 +39,7 @@
 
 # List of dependencies (most of which are build tools) which should be
 # ignored.
-set(BP_ignored_dependencies_LIST @ignored_dependencies_LIST@)
+set(BP_ignored_dependencies_LIST @ignored_dependencies_LIST@ ${extra_ignored_dependencies_list})
 
 set(@package@_dependencies_LIST @dependencies@)
 # Remove dependencies that should be ignored.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.