Browse Source

Tentative fix for #512

Christophe Riccio 9 years ago
parent
commit
b5766d1514
2 changed files with 5 additions and 2 deletions
  1. 2 2
      .travis.yml
  2. 3 0
      glm/simd/platform.h

+ 2 - 2
.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 ..

+ 3 - 0
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>