diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindQwt.cmake | 8 | ||||
| -rw-r--r-- | cmake/Toolchains/arm_cortex_a8_native.cmake | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake index 857020796..cbda16aa0 100644 --- a/cmake/Modules/FindQwt.cmake +++ b/cmake/Modules/FindQwt.cmake @@ -10,11 +10,17 @@ find_path (QWT_INCLUDE_DIRS /usr/local/include/qwt /usr/include/qwt-qt4 /usr/include/qwt + /opt/local/include/qwt + /sw/include/qwt ) find_library (QWT_LIBRARIES NAMES qwt-qt4 qwt - PATHS /usr/local/lib /usr/lib + PATHS + /usr/local/lib + /usr/lib + /opt/local/lib + /sw/lib ) # handle the QUIETLY and REQUIRED arguments and set QWT_FOUND to TRUE if diff --git a/cmake/Toolchains/arm_cortex_a8_native.cmake b/cmake/Toolchains/arm_cortex_a8_native.cmake index 7dbb80049..8e60eaab1 100644 --- a/cmake/Toolchains/arm_cortex_a8_native.cmake +++ b/cmake/Toolchains/arm_cortex_a8_native.cmake @@ -4,5 +4,5 @@ ######################################################################## set(CMAKE_CXX_COMPILER g++) set(CMAKE_C_COMPILER gcc) -set(CMAKE_CXX_FLAGS "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp") -set(CMAKE_C_FLAGS ${CMAKE_CXX_FLAGS}) #same flags for C sources +set(CMAKE_CXX_FLAGS "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp" CACHE STRING "" FORCE) +set(CMAKE_C_FLAGS ${CMAKE_CXX_FLAGS} CACHE STRING "" FORCE) #same flags for C sources |