ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: fix problem occurring with Wardje's setup

Browse Source 
For Wardje both tests (with and without Xxf86vm) failed because of gcc
being unable to execute 'as'. His error log showed also tests executed
by FindX11 (provided by CMake itself) failed because of this.
Not sure what is broken exactly but this patch circumvents it.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10980 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
undef-in-ed 2012-03-15 20:27:44 +00:00
parent d606e7eab9
commit fb7c95dd66
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/FindIrrlicht.cmake
View File

@ -65,16 +65,16 @@ if(UNIX AND NOT APPLE AND NOT CYGWIN)
set(CMAKE_REQUIRED_LIBRARIES ${IRRLICHT_LIBRARIES})
check_cxx_source_compiles(${IRRLICHT_SNIPPET} IRRLICHT_WITHOUT_XF86VM)
# If it does not work without Xxf86vm library...
# If it did not work without Xxf86vm library try with it again
if(NOT IRRLICHT_WITHOUT_XF86VM)
set(CMAKE_REQUIRED_LIBRARIES ${IRRLICHT_LIBRARIES} ${IRRLICHT_XF86VM_LIBRARY})
check_cxx_source_compiles(${IRRLICHT_SNIPPET} IRRLICHT_WITH_XF86VM)
# ... but with Xxf86vm, then add this library to Irrlicht dependencies
if(IRRLICHT_WITH_XF86VM)
set(IRRLICHT_LIBRARIES ${IRRLICHT_LIBRARIES} ${IRRLICHT_XF86VM_LIBRARY})
else()
if(NOT IRRLICHT_WITH_XF86VM)
message(WARNING "Irrlicht does not compile with and without Xxf86vm")
endif()
# Add Xxf86vm nevertheless as tests might fail under strange circumstances
set(IRRLICHT_LIBRARIES ${IRRLICHT_LIBRARIES} ${IRRLICHT_XF86VM_LIBRARY})
endif()
endif()