widelands-dev team mailing list archive

[Dmitry Marakasov <amdmi3@xxxxxxxxx>]

Dmitry Marakasov has proposed merging lp:~amdmi3/widelands/widelands into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~amdmi3/widelands/widelands/+merge/137285

Build system fix required to build widelands on FreeBSD
-- 
https://code.launchpad.net/~amdmi3/widelands/widelands/+merge/137285
Your team Widelands Developers is requested to review the proposed merge of lp:~amdmi3/widelands/widelands into lp:widelands.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-10-04 20:13:30 +0000
+++ CMakeLists.txt	2012-11-30 18:22:34 +0000
@@ -404,10 +404,10 @@
   include_directories(${MINIZIP_INCLUDE_DIR})
 endif (MINIZIP_FOUND)
 
-if (APPLE OR WIN32)
+if (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
   find_package(intl REQUIRED)
   include_directories(${INTL_INCLUDE_DIR})
-endif (APPLE OR WIN32)
+endif (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 
 find_package(SDL REQUIRED)
 include_directories(${SDL_INCLUDE_DIR})

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-05-05 18:50:50 +0000
+++ src/CMakeLists.txt	2012-11-30 18:22:34 +0000
@@ -128,9 +128,9 @@
 target_link_libraries(widelands widelands_all)
 target_link_libraries(widelands ${SDL_LIBRARY})
 
-if (APPLE OR WIN32)
+if (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
   target_link_libraries(widelands_all ${INTL_LIBRARY})
-endif (APPLE OR WIN32)
+endif (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 
 if (WIN32)
   if (DEFINED MSVC)