Merge branch 'AltCompilers' of https://bitbucket.org/LightDrake/singularityviewer into V2MultiWear
Conflicts: indra/cmake/00-Common.cmake
This commit is contained in:
@@ -17,7 +17,7 @@ if(NOT FMODEX)
|
||||
include(FMOD)
|
||||
endif(NOT FMODEX)
|
||||
include(OPENAL)
|
||||
include(HUNSPELL)
|
||||
include(Hunspell)
|
||||
include(FindOpenGL)
|
||||
#include(JsonCpp)
|
||||
include(LLAddBuildTest)
|
||||
|
||||
Reference in New Issue
Block a user