summaryrefslogtreecommitdiff
path: root/unity-standalone
diff options
authortimo.jyrinki@canonical.com <>2012-07-06 13:20:29 +0300
committertimo.jyrinki@canonical.com <>2012-07-06 13:20:29 +0300
commit49a15ce3b79313c7a183006152f07d5b7d7e1db3 (patch)
tree06b947dea4b039e549c2987ea11acd9f857b1530 /unity-standalone
parent5c101a615db71d00dfbd2d3782ba240a7239d44f (diff)
Move the check to the top-level CMakeLists.txt
(bzr r2434.3.4)
Diffstat (limited to 'unity-standalone')
-rw-r--r--unity-standalone/CMakeLists.txt8
1 files changed, 1 insertions, 7 deletions
diff --git a/unity-standalone/CMakeLists.txt b/unity-standalone/CMakeLists.txt
index 9d861e0ae..d61c8110f 100644
--- a/unity-standalone/CMakeLists.txt
+++ b/unity-standalone/CMakeLists.txt
@@ -12,16 +12,10 @@ set (CFLAGS
if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
set (CFLAGS ${CFLAGS} "-fPIC")
-endif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+endif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
add_definitions (${CFLAGS})
-if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
- set (UNITY_STANDALONE_LADD "-lunity-core-${UNITY_API_VERSION} -lm")
-else ()
- set (UNITY_STANDALONE_LADD "-lunity-core-${UNITY_API_VERSION} -lm -lGL -lGLU")
-endif ()
-
set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} ${UNITY_STANDALONE_LADD})
link_libraries (${LIBS})