Return to patch-CMakeLists_txt CVS log

Up to [local] / ports / games / megaglest / base / patches

Annotation of ports/games/megaglest/base/patches/patch-CMakeLists_txt, Revision 1.3

1.1       yason       1: $OpenBSD$
1.2       yason       2: --- CMakeLists.txt.orig        Sat Jul  9 05:57:19 2011
1.3     ! yason       3: +++ CMakeLists.txt     Wed Sep 14 22:54:31 2011
1.2       yason       4: @@ -68,7 +68,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
                      5:        SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g3")
1.1       yason       6:
1.2       yason       7:        # Release compiler flags
                      8: -      SET(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS_RELEASE} -O3 ")
                      9: +      SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
                     10:        SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -s")  ## Strip binary
                     11:
                     12:        # Release with debug info compiler flags
1.3     ! yason      13: @@ -119,7 +119,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
        !            14:                        SET(MEGAGLEST_ICON_INSTALL_PATH "share/pixmaps/" CACHE STRING "The installation path for icon files (this is appended to the CMAKE_INSTALL_PREFIX)")
        !            15:                ENDIF()
        !            16:                IF(NOT MEGAGLEST_MANPAGE_INSTALL_PATH)
        !            17: -                      SET(MEGAGLEST_MANPAGE_INSTALL_PATH "share/man/man6/" CACHE STRING "The installation path for manpage files (this is appended to the CMAKE_INSTALL_PREFIX)")
        !            18: +                      SET(MEGAGLEST_MANPAGE_INSTALL_PATH "man/man6/" CACHE STRING "The installation path for manpage files (this is appended to the CMAKE_INSTALL_PREFIX)")
        !            19:                ENDIF()
        !            20:
        !            21:                IF(NOT CUSTOM_DATA_INSTALL_PATH)
1.2       yason      22: @@ -195,15 +195,15 @@ IF(EXISTS "${PROJECT_SOURCE_DIR}/source/")
                     23:
                     24:        ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/shared_lib )
                     25:        ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/glest_game )
                     26: -      #if(wxWidgets_FOUND)
                     27: -        ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/glest_map_editor )
                     28: -        ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/g3d_viewer )
                     29: -        ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/configurator )
                     30: -      #else()
                     31: -      #  MESSAGE(STATUS "WARNING... the following game tools will NOT be built since we cannot find wxWidgets on this machine")
                     32: -      #  MESSAGE(STATUS "map editor, g3d viewer, configurator")
                     33: -      #endif()
                     34: -      ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/tools/glexemel )
                     35: +#     #if(wxWidgets_FOUND)
                     36: +#       ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/glest_map_editor )
                     37: +#       ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/g3d_viewer )
                     38: +#       ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/configurator )
                     39: +#     #else()
                     40: +#     #  MESSAGE(STATUS "WARNING... the following game tools will NOT be built since we cannot find wxWidgets on this machine")
                     41: +#     #  MESSAGE(STATUS "map editor, g3d viewer, configurator")
                     42: +#     #endif()
                     43: +#     ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/tools/glexemel )
                     44:
                     45:        IF(APPLE)
                     46:                include(${PROJECT_SOURCE_DIR}/mk/macosx/CMakeLists.txt)