diff options
| author | Robert G. Jakabosky <bobby@sharedrealm.com> | 2012-06-15 04:52:08 -0700 |
|---|---|---|
| committer | Robert G. Jakabosky <bobby@sharedrealm.com> | 2012-06-15 04:52:08 -0700 |
| commit | a8bcd9cad2d0b76761d7a442b0b309c0fc98b979 (patch) | |
| tree | 13babfbd9395caf240ece547bc61157522074840 | |
| parent | 042f97b5a369c5f64985781fdf1ae039c9675b8b (diff) | |
| download | luagit2-a8bcd9cad2d0b76761d7a442b0b309c0fc98b979.tar.gz | |
Fix linking with libgit2 in non-system lib folder.
| -rwxr-xr-x | CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 85217ae..46f127d 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,6 @@ set(USE_PRE_GENERATED_BINDINGS TRUE CACHE BOOL "Set this to FALSE to re-generate bindings using LuaNativeObjects") set(COMMON_CFLAGS "${CFLAGS}") -set(COMMON_LDFLAGS) set(COMMON_LIBS) ## Lua 5.1.x @@ -25,20 +24,21 @@ if(NOT ${LUA51_FOUND}) message(FATAL_ERROR "The FindLua51 module could not find lua :-(") endif() set(COMMON_LIBS "${COMMON_LIBS};${LUA_LIBRARIES}") +include_directories(${LUA_INCLUDE_DIR}) ## LibGit2 include(FindPkgConfig) pkg_search_module(GIT2 REQUIRED libgit2=0.17.0) -set(COMMON_CFLAGS "${COMMON_CFLAGS} ${GIT2_CFLAGS}") -set(COMMON_LDFLAGS "${COMMON_LDFLAGS} ${GIT2_LDFLAGS}") +add_definitions(${GIT2_CFLAGS}) +link_directories(${GIT2_LIBRARY_DIRS}) +include_directories(${GIT2_INCLUDE_DIRS}) set(COMMON_LIBS "${COMMON_LIBS};${GIT2_LIBRARIES}") ## LuaNativeObjects include(LuaNativeObjects) include_directories(${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${LUA_INCLUDE_DIR}) + ${CMAKE_CURRENT_BINARY_DIR}) # # Setup CMAKE_C_FLAGS* and CMAKE_CXX_FLAGS* |