gplugin/gplugin

Fix up the findtcc module
feature/tcc-loader
2016-08-22, Gary Kramlich
9f6305a9c749
Parents 248adf7fa170
Children 8a10e665eab7
Fix up the findtcc module
2 files changed, 17 insertions(+), 5 deletions(-)
  • +14 -3
    cmake/Modules/FindLibTcc.cmake
  • +3 -2
    tcc/CMakeLists.txt
    • --- a/cmake/Modules/FindLibTcc.cmake Sun Aug 21 23:56:03 2016 -0500
    +++ b/cmake/Modules/FindLibTcc.cmake Mon Aug 22 13:03:48 2016 -0500
    @@ -15,21 +15,32 @@
    OUTPUT_VARIABLE BREW_TCC_PREFIX
    OUTPUT_STRIP_TRAILING_WHITESPACE
    )
    +
    + set(BREW_TCC_LIB_DIR ${BREW_TCC_PREFIX}/lib)
    + set(BREW_TCC_INCLUDE_DIR ${BREW_TCC_PREFIX}/include)
    endif(BREW)
    endif(APPLE)
    -find_library(libtcc_LIBRARY
    +find_path(LIBTCC_INCLUDE_DIR
    + NAMES libtcc.h
    + PATHS
    + /usr/include
    + /usr/local/include
    + ${BREW_TCC_INCLUDE_DIR}
    +)
    +
    +find_library(LIBTCC_LIBRARIES
    NAMES libtcc.a
    PATHS
    /usr/lib
    /usr/local/lib
    /usr/lib/x86_64-linux-gnu
    /usr/lib/x86_32-linux-gnu
    - ${BREW_TCC_PREFIX}/lib
    + ${BREW_TCC_LIB_DIR}
    )
    include(CMakeParseArguments)
    -find_package_handle_standard_args(libtcc REQUIRED_VARS libtcc_LIBRARY libtcc_INCLUDE_DIR)
    +find_package_handle_standard_args(libtcc REQUIRED_VARS LIBTCC_LIBRARIES LIBTCC_INCLUDE_DIR)
    set(TCC_FOUND ${LIBTCC_FOUND})
    --- a/tcc/CMakeLists.txt Sun Aug 21 23:56:03 2016 -0500
    +++ b/tcc/CMakeLists.txt Mon Aug 22 13:03:48 2016 -0500
    @@ -18,6 +18,8 @@
    find_package(LibTcc REQUIRED)
    + include_directories(${LIBTCC_INCLUDE_DIR})
    +
    #pkg_check_modules(TCC REQUIRED libtcc)
    add_library(gplugin-tcc MODULE
    ${GPLUGIN_TCC_SOURCES}
    @@ -25,9 +27,8 @@
    )
    set_target_properties(gplugin-tcc PROPERTIES PREFIX "")
    - include_directories(${TCC_INCLUDE_DIRS})
    target_link_libraries(gplugin-tcc
    - ${TCC_LIBRARIES}
    + ${LIBTCC_LIBRARIES}
    gplugin
    )