equal
deleted
inserted
replaced
15 #find_package(QCA2 REQUIRED) |
15 #find_package(QCA2 REQUIRED) |
16 #include_directories(${QCA2_INCLUDE_DIR}) |
16 #include_directories(${QCA2_INCLUDE_DIR}) |
17 |
17 |
18 # Configure for SDL |
18 # Configure for SDL |
19 find_package(SDL REQUIRED) |
19 find_package(SDL REQUIRED) |
|
20 find_package(Sparkle) |
20 |
21 |
21 include_directories(.) |
22 include_directories(.) |
22 include_directories(${SDL_INCLUDE_DIR}) |
23 include_directories(${SDL_INCLUDE_DIR}) |
23 if(UNIX) |
24 if(UNIX) |
24 include_directories("/usr/local/include") # HACK: in freebsd cannot find iconv.h included via SDL.h |
25 include_directories("/usr/local/include") # HACK: in freebsd cannot find iconv.h included via SDL.h |
135 ammoSchemeModel.h |
136 ammoSchemeModel.h |
136 togglebutton.h |
137 togglebutton.h |
137 bgwidget.h |
138 bgwidget.h |
138 ) |
139 ) |
139 |
140 |
140 if(APPLE) |
141 if(APPLE AND SPARKLE_FOUND) |
141 find_package(Sparkle REQUIRED) |
|
142 set(hwfr_src ${hwfr_src} AutoUpdater.cpp CocoaInitializer.mm SparkleAutoUpdater.mm) |
142 set(hwfr_src ${hwfr_src} AutoUpdater.cpp CocoaInitializer.mm SparkleAutoUpdater.mm) |
143 #set(hwfr_moc_hdrs ${hwfr_moc_hdrs} AutoUpdater.h CocoaInitializer.h SparkleAutoUpdater.h) |
143 #set(hwfr_moc_hdrs ${hwfr_moc_hdrs} AutoUpdater.h CocoaInitializer.h SparkleAutoUpdater.h) |
144 endif(APPLE) |
144 endif() |
145 |
145 |
146 set(hwfr_hdrs |
146 set(hwfr_hdrs |
147 binds.h |
147 binds.h |
148 ui_hwform.h |
148 ui_hwform.h |
149 predefteams.h |
149 predefteams.h |
186 set(HW_LINK_LIBS |
186 set(HW_LINK_LIBS |
187 ${OPENAL_LIBRARY} |
187 ${OPENAL_LIBRARY} |
188 ${OGG_LIBRARY} |
188 ${OGG_LIBRARY} |
189 ${VORBIS_LIBRARY} |
189 ${VORBIS_LIBRARY} |
190 ${HW_LINK_LIBS} |
190 ${HW_LINK_LIBS} |
191 ${SPARKLE_LIBRARY} |
|
192 ) |
191 ) |
|
192 if (SPARKLE_FOUND) |
|
193 set(HW_LINK_LIBS ${HW_LINK_LIBS} ${SPARKLE_LIBRARY}) |
|
194 set(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS} "-DSPARKLE_ENABLED") |
|
195 endif() |
193 endif() |
196 endif() |
194 |
197 |
195 |
198 |
196 if(WIN32 AND NOT UNIX) |
199 if(WIN32 AND NOT UNIX) |
197 if(NOT SDL_LIBRARY) |
200 if(NOT SDL_LIBRARY) |