From 234d442e0abc782c477b0f29febedeb1ced33cc2 Mon Sep 17 00:00:00 2001
From: Christophe Riccio <christophe.riccio@unity3d.com>
Date: Wed, 23 Nov 2016 23:13:54 +0100
Subject: [PATCH] Tentative fix for #512

---
 .travis.yml         | 4 ++--
 glm/simd/platform.h | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7201db70..cbbf87f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ script:
 - cd ..
 - mkdir ./build_simd_11
 - cd ./build_simd_11
-- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON ..
+- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON ..
 - cmake --build .
 - ctest
 - cd ..
@@ -46,7 +46,7 @@ script:
 - cd ..
 - mkdir ./build_simd_98
 - cd ./build_simd_98
-- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON ..
+- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON ..
 - cmake --build .
 - ctest
 - cd ..
diff --git a/glm/simd/platform.h b/glm/simd/platform.h
index b8b11a76..36abb068 100644
--- a/glm/simd/platform.h
+++ b/glm/simd/platform.h
@@ -422,6 +422,9 @@
 #elif GLM_ARCH & GLM_ARCH_AVX_BIT
 #	include <immintrin.h>
 #elif GLM_ARCH & GLM_ARCH_SSE42_BIT
+#	if GLM_COMPILER & GLM_COMPILER_CLANG
+#		include <popcntintrin.h>
+#	endif
 #	include <nmmintrin.h>
 #elif GLM_ARCH & GLM_ARCH_SSE41_BIT
 #	include <smmintrin.h>