diff options
| author | Jussi Pakkanen <jussi.pakkanen@canonical.com> | 2012-12-15 03:03:32 +0000 |
|---|---|---|
| committer | Tarmac <> | 2012-12-15 03:03:32 +0000 |
| commit | c75dbf2063613ce19e3865a76d8738ce2ac21a86 (patch) | |
| tree | 0d70de61fcdd5cac96f947c0ecfd0c394eec1704 /unity-shared | |
| parent | aef4784328d6c992bc1d6df9ed9a201c40a09557 (diff) | |
| parent | e551b2dd15a4a03552214dbf3e3404c1becdd8a7 (diff) | |
Even more build fixes.
Approved by Marco Trevisan (Treviño). (bzr r2993)
Diffstat (limited to 'unity-shared')
| -rw-r--r-- | unity-shared/CMakeLists.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/unity-shared/CMakeLists.txt b/unity-shared/CMakeLists.txt index bb5e98662..ba099aeee 100644 --- a/unity-shared/CMakeLists.txt +++ b/unity-shared/CMakeLists.txt @@ -5,13 +5,11 @@ find_package (PkgConfig) set (CFLAGS ${CACHED_UNITY_DEPS_CFLAGS} ${CACHED_UNITY_DEPS_CFLAGS_OTHER} + ${PIC_FLAGS} ) -if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l") - set (CFLAGS ${CFLAGS} "-fPIC") -endif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l") - -add_definitions (${CFLAGS}) +string (REPLACE ";" " " CFLAGS "${CFLAGS}") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CFLAGS}") set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} ${UNITY_STANDALONE_LADD}) |