ports/games/violetland/patches/patch-CMakeLists_txt - diff

Return to patch-CMakeLists_txt CVS log

Up to [local] / ports / games / violetland / patches

Diff for /ports/games/violetland/patches/patch-CMakeLists_txt between version 1.3 and 1.4

-version 1.3, 2011/12/23 21:20:46
+version 1.4, 2016/02/25 19:59:55
 Line 1
 Line 1
 Line 1
  $OpenBSD$
- --- CMakeLists.txt.orig Thu Jun  9 20:01:30 2011
+ --- CMakeLists.txt.orig Mon Jan  4 23:15:21 2016
- +++ CMakeLists.txt      Tue Jun 14 13:24:07 2011
+ +++ CMakeLists.txt      Thu Feb 25 22:52:52 2016
- @@ -7,6 +7,8 @@ find_package(SDL_image REQUIRED)
+ @@ -13,14 +13,14 @@ add_definitions(-DBOOST_FILESYSTEM_VERSION=3)
-  find_package(SDL_ttf REQUIRED)
-  find_package(SDL_mixer REQUIRED)
+  # Searching for libintl using bundled CMake script
-  find_package(OpenGL REQUIRED)
+  set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/lib/fcitx/cmake")
- +find_package(Gettext REQUIRED)
+ -include(FindLibintl)
- +find_package(Libintl REQUIRED)
+ +find_package(Intl REQUIRED)
-  find_package(Boost COMPONENTS filesystem system REQUIRED)
-  add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
+  if(${MINGW})
+         set(LIBINTL_LIBRARIES intl)
- @@ -14,8 +16,8 @@ if(${MINGW})
+  endif(${MINGW})
-         set(INTL_LIBRARY intl)
-  endif(${MINGW})
+ -set(incDirList  ${SDL_INCLUDE_DIR}  ${SDLIMAGE_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR} ${SDLMIXER_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${LIBINTL_INCLUDE_DIR})
+ -set(libList ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ${SDLMIXER_LIBRARY} ${OPENGL_LIBRARIES} ${Boost_LIBRARIES} ${LIBINTL_LIBRARIES})
- -set(incDirList  ${SDL_INCLUDE_DIR}  ${SDLIMAGE_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR} ${SDLMIXER_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
+ +set(incDirList  ${SDL_INCLUDE_DIR}  ${SDLIMAGE_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR} ${SDLMIXER_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${Intl_INCLUDE_DIRS})
- -set(libList ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ${SDLMIXER_LIBRARY} ${OPENGL_LIBRARIES} ${Boost_LIBRARIES} ${INTL_LIBRARY})
+ +set(libList ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ${SDLMIXER_LIBRARY} ${OPENGL_LIBRARIES} ${Boost_LIBRARIES} ${Intl_LIBRARIES})
- +set(incDirList ${GETTEXT_INCLUDE_DIR} ${LIBINTL_INCLUDE_DIR} ${SDL_INCLUDE_DIR}  ${SDLIMAGE_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR} ${SDLMIXER_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
- +set(libList ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ${SDLMIXER_LIBRARY} ${OPENGL_LIBRARIES} ${Boost_LIBRARIES} ${LIBINTL_LIBRARIES})
+  if (DEFINED LOCALE_INSTALL_DIR)
+         set(LOCALEDIR "${LOCALE_INSTALL_DIR}")
-  include_directories(${incDirList})

CVSweb