summaryrefslogtreecommitdiff
diff options
Diffstat
-rw-r--r--CMakeLists.txt6
-rw-r--r--dash/CMakeLists.txt8
-rw-r--r--hud/CMakeLists.txt8
-rw-r--r--launcher/CMakeLists.txt8
-rw-r--r--panel/CMakeLists.txt8
-rw-r--r--shortcuts/CMakeLists.txt8
-rw-r--r--unity-shared/CMakeLists.txt8
-rw-r--r--unity-standalone/CMakeLists.txt8
8 files changed, 13 insertions, 49 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc034a517..470c6630c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,12 @@ set (CMAKE_CXX_FLAGS "-DGNOME_DESKTOP_USE_UNSTABLE_API -std=c++0x -fno-permissiv
set (CMAKE_CXX_FLAGS_DEBUG "-g3")
set (CMAKE_CXX_FLAGS_RELEASE "")
+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 ()
+
option (USE_MODERN_COMPIZ_GL "Use Modern Compiz GL API" OFF)
if (USE_MODERN_COMPIZ_GL)
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_MODERN_COMPIZ_GL")
diff --git a/dash/CMakeLists.txt b/dash/CMakeLists.txt
index 36be675b0..7aee3ce68 100644
--- a/dash/CMakeLists.txt
+++ b/dash/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})
diff --git a/hud/CMakeLists.txt b/hud/CMakeLists.txt
index 5c31a472e..4da89417c 100644
--- a/hud/CMakeLists.txt
+++ b/hud/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})
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index 5bc5a34c2..b2b9a4b31 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -13,16 +13,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})
diff --git a/panel/CMakeLists.txt b/panel/CMakeLists.txt
index a01e572b1..fc30d76f3 100644
--- a/panel/CMakeLists.txt
+++ b/panel/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})
diff --git a/shortcuts/CMakeLists.txt b/shortcuts/CMakeLists.txt
index a7776b9a1..1b280a4a0 100644
--- a/shortcuts/CMakeLists.txt
+++ b/shortcuts/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})
diff --git a/unity-shared/CMakeLists.txt b/unity-shared/CMakeLists.txt
index f2108892b..46603fce7 100644
--- a/unity-shared/CMakeLists.txt
+++ b/unity-shared/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})
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})
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-08 02:04:31 +0000