gplugin/gplugin

re-enable the g-i stuff on osx
feature/osx-fixing
2015-12-19, Gary Kramlich
bc3c51f3753a
Parents 1dde3157546b
Children 3c33bd5d2f15
re-enable the g-i stuff on osx
1 files changed, 17 insertions(+), 22 deletions(-)
  • +17 -22
    gplugin/CMakeLists.txt
    • --- a/gplugin/CMakeLists.txt Thu Mar 05 13:37:42 2015 -0600
    +++ b/gplugin/CMakeLists.txt Sat Dec 19 11:23:36 2015 -0600
    @@ -218,30 +218,25 @@
    # GObject Introspection
    ###############################################################################
    if(BUILD_GIR)
    - if(APPLE)
    - message("The GObject Introspection build always fails on OS X, "
    - "skipping")
    - else(APPLE)
    - include(GObjectIntrospection)
    + include(GObjectIntrospection)
    - set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CMAKE_BINARY_DIR}")
    + set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CMAKE_BINARY_DIR}")
    - gobject_introspection(
    - FILENAME GPlugin-${GPLUGIN_MAJOR_VERSION}.${GPLUGIN_MINOR_VERSION}.gir
    - PACKAGES glib-2.0 gmodule-2.0 gobject-2.0
    - LIBRARY gplugin
    - QUIET
    - SCANNER_ARGS --add-include-path=${CMAKE_CURRENT_SOURCE_DIR}
    - --include=GModule-2.0 --include=GObject-2.0
    - COMPILER_ARGS --includedir=${CMAKE_CURRENT_SOURCE_DIR}
    - SYMBOL_PREFIXES gplugin
    - SOURCES ${GPLUGIN_SOURCES} ${GPLUGIN_HEADERS}
    - BUILT_SOURCES ${GPLUGIN_PUBLIC_BUILT_SOURCES}
    - ${GPLUGIN_PUBLIC_BUILT_HEADERS}
    - )
    - # For loader plugin tests dependencies
    - set(GPLUGIN_GIR_TARGETS ${GPLUGIN_GIR_TARGETS} PARENT_SCOPE)
    - endif(APPLE)
    + gobject_introspection(
    + FILENAME GPlugin-${GPLUGIN_MAJOR_VERSION}.${GPLUGIN_MINOR_VERSION}.gir
    + PACKAGES glib-2.0 gmodule-2.0 gobject-2.0
    + LIBRARY gplugin
    + QUIET
    + SCANNER_ARGS --add-include-path=${CMAKE_CURRENT_SOURCE_DIR}
    + --include=GModule-2.0 --include=GObject-2.0
    + COMPILER_ARGS --includedir=${CMAKE_CURRENT_SOURCE_DIR}
    + SYMBOL_PREFIXES gplugin
    + SOURCES ${GPLUGIN_SOURCES} ${GPLUGIN_HEADERS}
    + BUILT_SOURCES ${GPLUGIN_PUBLIC_BUILT_SOURCES}
    + ${GPLUGIN_PUBLIC_BUILT_HEADERS}
    + )
    + # For loader plugin tests dependencies
    + set(GPLUGIN_GIR_TARGETS ${GPLUGIN_GIR_TARGETS} PARENT_SCOPE)
    endif(BUILD_GIR)
    ###############################################################################