From 22d6f792f3fb2cf1b153de6120bd9807c7e61163 Mon Sep 17 00:00:00 2001 From: Colin Wallace Date: Wed, 21 Oct 2015 04:20:09 +0000 Subject: [PATCH 1/2] Fix CMake error when SM_COMPILE_FLAGS is empty (e.g. when compiling with cmake -DWITH_SSE2=off) --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b706b7d686..beb39bdb67 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -140,7 +140,7 @@ if(MSVC) endif() set_target_properties("${SM_EXE_NAME}" PROPERTIES - COMPILE_FLAGS ${SM_COMPILE_FLAGS} + COMPILE_FLAGS "${SM_COMPILE_FLAGS}" ) set_target_properties("${SM_EXE_NAME}" PROPERTIES From dcd676b9560822a8d7a06ddbafe38ab06b92103f Mon Sep 17 00:00:00 2001 From: Colin Wallace Date: Wed, 21 Oct 2015 06:28:30 +0000 Subject: [PATCH 2/2] Don't define CPU_X86 on non-x86 processors --- src/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index beb39bdb67..f27f798c2a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -294,9 +294,11 @@ else() # Linux if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") message("Host processor is 64bit") sm_add_compile_definition("${SM_EXE_NAME}" CPU_X86_64) - else() + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86") message("Host processor is 32bit") sm_add_compile_definition("${SM_EXE_NAME}" CPU_X86) + else() + message("Unrecognized host processor type") endif() endif() if (${HAS_FFMPEG})