kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Need to check both CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE and CMAKE_WX_CONFIG.

This commit is contained in:
Brad King 2003-08-11 17:35:13 -04:00
parent 730a278f89
commit 6c9ba639f4
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/WXDialog/CMakeLists.txt
View File

@ -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 ${WXWINDOWS_LIBRARY})
TARGET_LINK_LIBRARIES(CMake.app/Contents/MacOS/wxCMakeSetup CMakeLib) 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( ADD_CUSTOM_COMMAND(
SOURCE CMake.app/Contents/MacOS/wxCMakeSetup SOURCE CMake.app/Contents/MacOS/wxCMakeSetup
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
ARGS -E chdir "\"${EXECUTABLE_OUTPUT_PATH}/CMake.app/Contents/MacOS\"" 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\"" "\"${EXECUTABLE_OUTPUT_PATH}/CMake.app/Contents/MacOS/wxCMakeSetup\""
TARGET CMake.app/Contents/MacOS/wxCMakeSetup TARGET CMake.app/Contents/MacOS/wxCMakeSetup
) )