|
From: <ai...@us...> - 2013-07-29 17:37:36
|
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.
|