|
|
@@ -361,7 +361,7 @@ IF(BUILD_TESTING)
|
|
|
objc++)
|
|
|
ENDIF (APPLE)
|
|
|
|
|
|
- IF (CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE)
|
|
|
+ IF (CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE OR WXWINDOWS_INCLUDE_DIR)
|
|
|
# Will be set if the wxwindows gui is on
|
|
|
ADD_TEST(UseWX ${EXECUTABLE_OUTPUT_PATH}/cmaketest
|
|
|
${CMake_SOURCE_DIR}/Tests/UseWX
|
|
|
@@ -370,7 +370,7 @@ IF(BUILD_TESTING)
|
|
|
${CMake_BINARY_DIR}/Tests/UseWX
|
|
|
UsewxWindows
|
|
|
CMAKE_ARGS -DCMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE:FILEPATH=${CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE})
|
|
|
- ENDIF (CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE)
|
|
|
+ ENDIF (CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE OR WXWINDOWS_INCLUDE_DIR)
|
|
|
|
|
|
IF(UNIX)
|
|
|
IF("x${CMAKE_INSTALL_PREFIX}" MATCHES "^x${CMake_BINARY_DIR}/Tests/TestInstall/Prefix$")
|