← Back to branch summary

~widelands-dev/widelands/trunk

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: The Widelands Bunnybot
  • Date: 2021-12-30 20:11:15 UTC
  • Revision ID: bunnybot@widelands.org-20211230201115-636kyp607bco11an
Replace Boost::Asio → Asio (#5164)

Co-authored-by: Tóth András <txa-dev@posteo.hu>

(by Noordfrees)
7841615f6a955b941058acc5d9deb98e6e1b2dc0

Show diffs side-by-side

added added

removed removed

Lines of Context:
CMakeLists.txt
88
88
 
89
89
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
90
90
 
91
 
set (Boost_USE_STATIC_LIBS  OFF)
92
91
if (WIN32)
93
 
  set (Boost_USE_STATIC_LIBS  ON)
94
92
  link_libraries(wsock32 ws2_32 bcrypt)
95
93
endif()
96
94
if (OPTION_BUILD_WINSTATIC)
122
120
  endif()
123
121
  set (OPTION_GLEW_STATIC ON)
124
122
endif()
125
 
set (Boost_USE_MULTITHREADED ON)
126
 
set (Boost_DETAILED_FAILURE_MSG ON)
127
 
find_package(Boost 1.48 COMPONENTS REQUIRED system)
128
123
 
129
124
find_package (PythonInterp REQUIRED)
130
125
 
291
286
    wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wredundant-decls")
292
287
  endif()
293
288
 
294
 
  # Because of: https://svn.boost.org/trac/boost/ticket/9240.
295
 
  wl_add_flag(WL_GENERIC_CXX_FLAGS "-fext-numeric-literals")
296
 
 
297
289
  wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wall")
298
290
  wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wpedantic")
299
291
  wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wdeprecated-declarations")
366
358
endif(USE_FLTO_IF_AVAILABLE STREQUAL  "yes")
367
359
 
368
360
IF (WIN32)
 
361
  add_definitions(-D_WIN32_WINNT=0x0601)
369
362
  if(MSVC)
370
 
    add_definitions(-D_WIN32_WINNT=0x0601 -DWIN32_LEAN_AND_MEAN -D__STDC_FORMAT_MACROS -DNOMINMAX)
 
363
    add_definitions(-DWIN32_LEAN_AND_MEAN -D__STDC_FORMAT_MACROS -DNOMINMAX)
371
364
    # Needed for minizip
372
365
    add_definitions(-Dor=|| -Dand=&& -Dnot=!)
373
366
    if (OPTION_BUILD_WINSTATIC)
374
 
      set(ZSTD zstd_static)
375
367
      set(BROTLI brotlidec-static brotlicommon-static brotlienc-static)
376
368
      set(SDL_EXTRA_LIBS charset)
377
369
      if(CMAKE_BUILD_TYPE STREQUAL "Debug")