Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make test_for_selected_wxbuild target optional (patch 1696363)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-08 21:45:11 +00:00
parent 4609ee2ef8
commit a78a8f7fd5
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build/bakefiles/wxpresets/presets/wx.bkl
View File

@@ -122,6 +122,16 @@
base core net xml odbc xrc html adv media gl dbgrid qa aui richtext stc base core net xml odbc xrc html adv media gl dbgrid qa aui richtext stc
</set> </set>
<!-- if you define this variable to 0 before including wx presets, the
"test_for_selected_wxbuild" target which is added by default in win32 and GNU
makefiles, won't be added.
This is useful when e.g. you want to have wxWidgets as an optional
dependency and thus you don't want to perform that check unconditionally.
-->
<set var="WX_TEST_FOR_SELECTED_WXBUILD" overwrite="0">
1
</set>
<!-- this is a temporary variable until there is non general --> <!-- this is a temporary variable until there is non general -->
<!-- function in bakefiles for returning native markup for --> <!-- function in bakefiles for returning native markup for -->
<!-- reading envrionment variables --> <!-- reading envrionment variables -->

12
build/bakefiles/wxpresets/presets/wx_unix.bkl
View File

@@ -185,12 +185,14 @@ Format-specific notes:
that simply creating the following target; if it fails the make that simply creating the following target; if it fails the make
program will halt with the wx-config error message... program will halt with the wx-config error message...
--> -->
<action id="test_for_selected_wxbuild"> <if cond="WX_TEST_FOR_SELECTED_WXBUILD=='1'">
<dependency-of>all</dependency-of> <action id="test_for_selected_wxbuild">
<dependency-of>all</dependency-of>
<!-- Use @ to hide to the user that we're running wx-config... --> <!-- Use @ to hide to the user that we're running wx-config... -->
<command>@$(DOLLAR)(WX_CONFIG) $(WX_CONFIG_FLAGS)</command> <command>@$(DOLLAR)(WX_CONFIG) $(WX_CONFIG_FLAGS)</command>
</action> </action>
</if>
<!-- we need this but the trick used in default-values above <!-- we need this but the trick used in default-values above
prevents bakefile from detecting it: --> prevents bakefile from detecting it: -->

2
build/bakefiles/wxpresets/presets/wx_win32.bkl
View File

@@ -291,7 +291,7 @@
<__wx-syslibs/> <__wx-syslibs/>
</template> </template>
<if cond="FORMAT_SUPPORTS_ACTIONS=='1'"> <if cond="FORMAT_SUPPORTS_ACTIONS=='1' and WX_TEST_FOR_SELECTED_WXBUILD=='1'">
<!-- <!--
VERY IMPORTANT: before starting to build all targets of the generated makefile, VERY IMPORTANT: before starting to build all targets of the generated makefile,