diff options
| author | Brad King <brad.king@kitware.com> | 2003-08-11 21:35:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2003-08-11 21:35:13 (GMT) |
| commit | 6c9ba639f46d601704354a5df6f7d87c307648ee (patch) | |
| tree | 2af6b7d1aac874a9f06f12b970ac336f23c63211 /Source/WXDialog | |
| parent | 730a278f890bb985c3a4931a597540683b52f6a7 (diff) | |
| download | CMake-6c9ba639f46d601704354a5df6f7d87c307648ee.zip CMake-6c9ba639f46d601704354a5df6f7d87c307648ee.tar.gz CMake-6c9ba639f46d601704354a5df6f7d87c307648ee.tar.bz2 | |
BUG: Need to check both CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE and CMAKE_WX_CONFIG.
Diffstat (limited to 'Source/WXDialog')
| -rw-r--r-- | Source/WXDialog/CMakeLists.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/WXDialog/CMakeLists.txt b/Source/WXDialog/CMakeLists.txt index 2914681..90fe991 100644 --- a/Source/WXDialog/CMakeLists.txt +++ b/Source/WXDialog/CMakeLists.txt @@ -47,11 +47,18 @@ IF ( CMAKE_WX_CAN_COMPILE ) TARGET_LINK_LIBRARIES(CMake.app/Contents/MacOS/wxCMakeSetup ${WXWINDOWS_LIBRARY}) TARGET_LINK_LIBRARIES(CMake.app/Contents/MacOS/wxCMakeSetup CMakeLib) + # Support building by both CMake 1.6 and 1.8. + IF(NOT CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE) + IF(CMAKE_WX_CONFIG) + SET(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE ${CMAKE_WX_CONFIG}) + ENDIF(CMAKE_WX_CONFIG) + ENDIF(NOT CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE) + ADD_CUSTOM_COMMAND( SOURCE CMake.app/Contents/MacOS/wxCMakeSetup COMMAND ${CMAKE_COMMAND} ARGS -E chdir "\"${EXECUTABLE_OUTPUT_PATH}/CMake.app/Contents/MacOS\"" - `${CMAKE_WX_CONFIG} --rezflags` + `${CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE} --rezflags` "\"${EXECUTABLE_OUTPUT_PATH}/CMake.app/Contents/MacOS/wxCMakeSetup\"" TARGET CMake.app/Contents/MacOS/wxCMakeSetup ) |