Mercurial > trustbridge
comparison CMakeLists.txt @ 1224:7e720a820e1f
Merged.
| author | Emanuel Schuetze <emanuel@intevation.de> |
|---|---|
| date | Wed, 24 Sep 2014 14:54:26 +0200 |
| parents | 60927efa48cc |
| children | 3cd8dd706aaa |
comparison
equal
deleted
inserted
replaced
| 1223:fd47a79125c6 | 1224:7e720a820e1f |
|---|---|
| 132 | 132 |
| 133 # No chance to compile nss with -Werror | 133 # No chance to compile nss with -Werror |
| 134 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") | 134 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") |
| 135 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") | 135 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") |
| 136 | 136 |
| 137 # Cmake does not correctly identify gcc windres when cross compiling | |
| 138 # making this line neccessary to set the correct flags for it. | |
| 139 # See: http://public.kitware.com/Bug/view.php?id=11773 | |
| 140 SET(CMAKE_RC_COMPILE_OBJECT | |
| 141 "<CMAKE_RC_COMPILER> <FLAGS> <DEFINES> -Ocoff <SOURCE> <OBJECT>") | |
| 142 | |
| 137 add_subdirectory(common) | 143 add_subdirectory(common) |
| 138 | 144 |
| 139 add_subdirectory(cinst) | 145 add_subdirectory(cinst) |
| 140 if(Qt5Widgets_FOUND) | 146 if(Qt5Widgets_FOUND) |
| 141 add_subdirectory(ui) | 147 add_subdirectory(ui) |