diff options
| author | Brad King <brad.king@kitware.com> | 2006-07-21 19:43:19 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-07-21 19:43:19 (GMT) |
| commit | 3c9744f406d85a293fc504368d32ba34b5ed3332 (patch) | |
| tree | ae48986833aa8d1aabb369c88e832e769d9ef5af /Source/WXDialog/bin | |
| parent | b377c8ac725aea5a7b892b830b29fb80355cb097 (diff) | |
| download | CMake-3c9744f406d85a293fc504368d32ba34b5ed3332.zip CMake-3c9744f406d85a293fc504368d32ba34b5ed3332.tar.gz CMake-3c9744f406d85a293fc504368d32ba34b5ed3332.tar.bz2 | |
ENH: Applying patch from bug#3443 to implement FindwxWidgets.cmake properly. It also updates the UseWX test and WXDialog sources to use the new find script.
Diffstat (limited to 'Source/WXDialog/bin')
| -rw-r--r-- | Source/WXDialog/bin/FindUPX.cmake | 11 | ||||
| -rw-r--r-- | Source/WXDialog/bin/FindwxW.cmake | 4 | ||||
| -rw-r--r-- | Source/WXDialog/bin/FindwxWin.cmake | 5 | ||||
| -rw-r--r-- | Source/WXDialog/bin/UsewxW.cmake | 4 |
4 files changed, 17 insertions, 7 deletions
diff --git a/Source/WXDialog/bin/FindUPX.cmake b/Source/WXDialog/bin/FindUPX.cmake index 7623841..fc9113d 100644 --- a/Source/WXDialog/bin/FindUPX.cmake +++ b/Source/WXDialog/bin/FindUPX.cmake @@ -5,14 +5,11 @@ # UPX_FOUND Is set to 1 when upx is found FIND_PATH(UPX_PROGRAM_PATH upx.exe - "c:\Program Files\upx" - "d:\Program Files\upx" - "e:\Program Files\upx" - "f:\Program Files\upx" - "g:\Program Files\upx" - "h:\Program Files\upx" + ${UPX_DIR} + $ENV{UPX_DIR} + "$ENV{ProgramFiles}/upx" ) - + # when found, note this as target IF(UPX_PROGRAM_PATH) SET(UPX_FOUND 1) diff --git a/Source/WXDialog/bin/FindwxW.cmake b/Source/WXDialog/bin/FindwxW.cmake index 230bba8..f88eb0e 100644 --- a/Source/WXDialog/bin/FindwxW.cmake +++ b/Source/WXDialog/bin/FindwxW.cmake @@ -1,3 +1,6 @@ + +MESSAGE("${CMAKE_CURRENT_FILE} is deprecated, please use FindwxWidgets.cmake instead.") + # # FindwxW.cmake # v1.01 2005-05-27 @@ -14,6 +17,7 @@ # WXWIDGETS_INCLUDE_DIR = all include path of wxWindows # WXWIDGETS_DEFINITIONS = all flags of wxWindows + # NOTE: This module REQUIRES that an environment variable named WXWIN # be set to the base wxWidgets installation directory. # Under Unix, you must also set and environment variable named WXWINCFG diff --git a/Source/WXDialog/bin/FindwxWin.cmake b/Source/WXDialog/bin/FindwxWin.cmake index 699e7e1..7278dca 100644 --- a/Source/WXDialog/bin/FindwxWin.cmake +++ b/Source/WXDialog/bin/FindwxWin.cmake @@ -1,3 +1,8 @@ + + +MESSAGE("${CMAKE_CURRENT_FILE} is deprecated, please use FindwxWidgets.cmake instead.") + + ##--------------------------------------------------------------------------- ## $RCSfile$ ## $Source$ diff --git a/Source/WXDialog/bin/UsewxW.cmake b/Source/WXDialog/bin/UsewxW.cmake index e550e89..702ab9d 100644 --- a/Source/WXDialog/bin/UsewxW.cmake +++ b/Source/WXDialog/bin/UsewxW.cmake @@ -1,3 +1,7 @@ + +MESSAGE("${CMAKE_CURRENT_FILE} is deprecated, please use FindwxWidgets.cmake instead.") + + # # UsewxW.cmake # v1.0 2005-05-27 |