diff options
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | ept/CMakeLists.txt | 6 |
3 files changed, 7 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b693c8..40b9d67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,16 +7,6 @@ add_custom_target(check COMMAND ${CMAKE_SOURCE_DIR}/run-check ${CMAKE_BINARY_DIR set( EPT_VERSION "1.1" ) -# Get the soversion from libapt-pkg to include in our own -execute_process( - COMMAND "cc" "-xc" "-shared" "-Wl,--no-as-needed" "/dev/null" "-lapt-pkg" - ) -execute_process( - COMMAND "objdump" "-p" "a.out" - COMMAND "awk" "/NEEDED.*libapt-pkg/ { sub(\".*\\\\.so\\\\.\", \"\"); print }" - OUTPUT_VARIABLE LIBAPT_ABI_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE - ) set( LIBEPT_SOVERSION "1.aptpkg${LIBAPT_ABI_VERSION}" ) set( APT_INCLUDES "/usr/include/" CACHE STRING "apt include path" ) set( APT_LINKDIRS "/usr/lib/" CACHE STRING "apt library path" ) diff --git a/debian/control b/debian/control index 63c22de..e000b3b 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Vcs-Browser: http://git.debian.org/?p=debtags/libept.git Package: libept-dev Section: libdevel +Priority: optional Architecture: any Recommends: pkg-config Depends: diff --git a/ept/CMakeLists.txt b/ept/CMakeLists.txt index 079cd95..8ff8622 100644 --- a/ept/CMakeLists.txt +++ b/ept/CMakeLists.txt @@ -21,7 +21,13 @@ file( GLOB h_utils utils/*.h ) include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${TAGCOLL_INCLUDE_DIRS} ${WIBBLE_INCLUDE_DIRS} ) + +if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS") +link_libraries( ${WIBBLE_LIBRARIES} ${TAGCOLL_LIBRARIES} apt-pkg xapian -lsocket ) +else(${CMAKE_SYSTEM_NAME} MATCHES "SunOS") link_libraries( ${WIBBLE_LIBRARIES} ${TAGCOLL_LIBRARIES} apt-pkg xapian -lpthread ) +endif() + add_definitions( --std=c++11 -fexceptions -fPIC -fvisibility=default ) add_library( ept SHARED ${src} ) |