haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix check for incompatible glm version in cmake 

Build fails on GCC, but not with Clang. Modify the check to only catch the
cases where GLM does not work for sure.

Reference: lp:1804030
* https://bugs.launchpad.net/kicad/+bug/1804030
This commit is contained in:
Thomas Pointhuber 2019-01-06 11:55:15 +01:00 committed by Wayne Stambaugh
parent 73fb050b6d
commit bb7c889551
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -587,9 +587,9 @@ endif()
# Find GLM library, required # Find GLM library, required
# #
find_package( GLM 0.9.5.1 REQUIRED ) find_package( GLM 0.9.5.1 REQUIRED )
if( GLM_VERSION MATCHES "0.9.9.3" ) if( GLM_VERSION MATCHES "0.9.9.3" AND CMAKE_CXX_COMPILER_ID MATCHES "GNU")
MESSAGE( FATAL_ERROR "\nGLM version ${GLM_VERSION} is incompatible with KiCad.\n" MESSAGE( FATAL_ERROR "\nGLM version ${GLM_VERSION} is incompatible with KiCad using GCC.\n"
"Please downgrade to GLM version 0.9.9.2 or older" ) "Please downgrade to GLM version 0.9.9.2 or older or use clang instead" )
endif() endif()
add_definitions( -DGLM_FORCE_CTOR_INIT ) add_definitions( -DGLM_FORCE_CTOR_INIT )