]>
Commit | Line | Data |
---|---|---|
951d8ff0 ER |
1 | diff -up libsolv/bindings/ruby/CMakeLists.txt.rubyinclude libsolv/bindings/ruby/CMakeLists.txt |
2 | --- libsolv/bindings/ruby/CMakeLists.txt.rubyinclude 2012-06-07 10:06:19.372687533 +0200 | |
3 | +++ libsolv/bindings/ruby/CMakeLists.txt 2012-06-07 10:09:57.313968719 +0200 | |
4 | @@ -6,8 +6,17 @@ ELSE (USE_VENDORDIRS AND RUBY_VENDORARCH | |
5 | SET (RUBY_INSTALL_DIR ${RUBY_SITEARCH_DIR}) | |
6 | ENDIF (USE_VENDORDIRS AND RUBY_VENDORARCH_DIR) | |
7 | ||
8 | +EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['arch']" | |
9 | + OUTPUT_VARIABLE RUBY_ARCH) | |
10 | + | |
11 | +EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir']" | |
12 | + OUTPUT_VARIABLE RUBY_HDR_DIR) | |
13 | + | |
14 | +SET(RUBY_INCLUDE_DIRS ${RUBY_HDR_DIR} ${RUBY_HDR_DIR}/${RUBY_ARCH}) | |
15 | + | |
16 | MESSAGE (STATUS "Ruby executable: ${RUBY_EXECUTABLE}") | |
17 | MESSAGE (STATUS "Ruby installation dir: ${RUBY_INSTALL_DIR}") | |
18 | +MESSAGE (STATUS "Ruby include dir: ${RUBY_INCLUDE_DIRS}") | |
19 | ||
20 | ADD_CUSTOM_COMMAND ( | |
21 | OUTPUT solv_ruby.c | |
22 | @@ -17,7 +26,7 @@ ADD_CUSTOM_COMMAND ( | |
23 | ) | |
24 | ||
25 | ADD_DEFINITIONS(-Wno-unused) | |
26 | -INCLUDE_DIRECTORIES (${RUBY_INCLUDE_PATH}) | |
27 | +INCLUDE_DIRECTORIES (${RUBY_INCLUDE_DIRS}) | |
28 | ||
29 | ADD_LIBRARY (bindings_ruby SHARED solv_ruby.c) | |
30 | SET_TARGET_PROPERTIES (bindings_ruby PROPERTIES PREFIX "" OUTPUT_NAME "solv") |