Return to patch-CMakeLists_txt CVS log

Up to [local] / ports / devel / libgigi / patches

Annotation of ports/devel/libgigi/patches/patch-CMakeLists_txt, Revision 1.1

1.1     ! kirby       1: $OpenBSD$
        !             2: --- CMakeLists.txt.orig        Wed Oct 26 05:56:00 2011
        !             3: +++ CMakeLists.txt     Thu Jun 26 13:16:36 2014
        !             4: @@ -181,6 +181,7 @@ set(int_have_devil 0)
        !             5:  set(int_have_jpeg 0)
        !             6:  set(int_have_png 0)
        !             7:  set(int_have_tiff 0)
        !             8: +set(int_have_system_ltdl 0)
        !             9:  if (USE_DEVIL)
        !            10:      find_package(DevIL)
        !            11:      if (IL_FOUND)
        !            12: @@ -224,21 +225,24 @@ else ()
        !            13:      message(FATAL_ERROR "Freetype library not found.")
        !            14:  endif ()
        !            15:
        !            16: -
        !            17: -########################################
        !            18: -# Header Generation                    #
        !            19: -########################################
        !            20: -if (NOT EXISTS ${CMAKE_HOME_DIRECTORY}/libltdl/config.h)
        !            21: -    if (UNIX)
        !            22: -        message("-- Configuring libltdl using \"libltdl/configure\" ...")
        !            23: -        execute_process(
        !            24: -            COMMAND ${CMAKE_HOME_DIRECTORY}/libltdl/configure
        !            25: -            WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/libltdl
        !            26: -            OUTPUT_QUIET
        !            27: -        )
        !            28: -    else ()
        !            29: -        file(WRITE ${CMAKE_HOME_DIRECTORY}/libltdl/config.h
        !            30: -             "/* WARNING: Generated by GG's build system.  All local changes will be lost! */
        !            31: +find_package(ltdl)
        !            32: +if (LTDL_FOUND)
        !            33: +    message(STATUS "Using system libltdl.")
        !            34: +    include_directories(${LTDL_INCLUDE_DIRS})
        !            35: +    set(int_have_system_ltdl 1)
        !            36: +else ()
        !            37: +    message(STATUS "Using local libltdl.")
        !            38: +    if (NOT EXISTS ${CMAKE_HOME_DIRECTORY}/libltdl/config.h)
        !            39: +        if (UNIX)
        !            40: +            message("-- Configuring libltdl using \"libltdl/configure\" ...")
        !            41: +            execute_process(
        !            42: +                COMMAND ${CMAKE_HOME_DIRECTORY}/libltdl/configure
        !            43: +                WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/libltdl
        !            44: +                OUTPUT_QUIET
        !            45: +            )
        !            46: +        else ()
        !            47: +            file(WRITE ${CMAKE_HOME_DIRECTORY}/libltdl/config.h
        !            48: +                 "/* WARNING: Generated by GG's build system.  All local changes will be lost! */
        !            49:  #define error_t int
        !            50:  #define HAVE_STDIO_H 1
        !            51:  #define HAVE_STDLIB_H 1
        !            52: @@ -253,11 +257,16 @@ if (NOT EXISTS ${CMAKE_HOME_DIRECTORY}/libltdl/config.
        !            53:  #define LTDL_DLOPEN_DEPLIBS 1
        !            54:  #define LTDL_SHLIBPATH_VAR \"PATH\"
        !            55:  #define LTDL_SHLIB_EXT \".dll\"
        !            56: -"
        !            57: -        )
        !            58: +    "
        !            59: +            )
        !            60: +        endif ()
        !            61:      endif ()
        !            62: -endif ()
        !            63: +endif()
        !            64:
        !            65: +
        !            66: +########################################
        !            67: +# Header Generation                    #
        !            68: +########################################
        !            69:  configure_file(
        !            70:      ${CMAKE_HOME_DIRECTORY}/cmake/Config.h.in
        !            71:      ${CMAKE_HOME_DIRECTORY}/GG/Config.h