Common Source Code Project for Qt (a.k.a for FM-7).
| Revision | ee8c85e065af8e9a3a70f76681baf6092da30789 (tree) |
|---|---|
| Zeit | 2017-03-22 21:45:42 |
| Autor | K.Ohta <whatisthis.sowhat@gmai...> |
| Commiter | K.Ohta |
[Build][CMake] Add supporting for ZLIB.
source/build-cmake/cmake/config_commonsource.cmake (diff) source/build-cmake/cmake/config_sharedlibs.cmake (diff)| @@ -161,6 +161,12 @@ else() | ||
| 161 | 161 | endif() |
| 162 | 162 | endif() |
| 163 | 163 | |
| 164 | +include(FindZLIB) | |
| 165 | +if(ZLIB_FOUND) | |
| 166 | + add_definitions(-DUSE_ZLIB) | |
| 167 | + include_directories(${ZLIB_INCLUDE_DIRS}) | |
| 168 | +endif() | |
| 169 | + | |
| 164 | 170 | # GCC Only? |
| 165 | 171 | if(CMAKE_COMPILER_IS_GNUCC) |
| 166 | 172 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flax-vector-conversions") |
| @@ -263,6 +269,7 @@ if(WIN32) | ||
| 263 | 269 | ${SDL_LIBS} |
| 264 | 270 | ${LIBAV_LIBRARIES} |
| 265 | 271 | ${ADDITIONAL_LIBRARIES} |
| 272 | + ${ZLIB_LIBRARIES} | |
| 266 | 273 | ) |
| 267 | 274 | #SET(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> qcs <TARGET> <LINK_FLAGS> <OBJECTS>") |
| 268 | 275 | #SET(CMAKE_C_ARCHIVE_FINISH true) |
| @@ -282,7 +289,7 @@ else() | ||
| 282 | 289 | endif() |
| 283 | 290 | |
| 284 | 291 | if(USE_QT_5) |
| 285 | - set(BUNDLE_LIBS ${BUNDLE_LIBS} ${QT_LIBRARIES}) | |
| 292 | + set(BUNDLE_LIBS ${BUNDLE_LIBS} ${QT_LIBRARIES} ${ZLIB_LIBRARIES}) | |
| 286 | 293 | endif() |
| 287 | 294 | |
| 288 | 295 | set(BUNDLE_LIBS ${BUNDLE_LIBS} ${THREADS_LIBRARY}) |
Fork