diff options
| author | Enrico Zini <enrico@enricozini.org> | 2015-09-10 19:52:45 +0200 |
|---|---|---|
| committer | Enrico Zini <enrico@enricozini.org> | 2015-09-10 19:52:45 +0200 |
| commit | c5dd516802af50f8e369e9f520b88dcf28dc77df (patch) | |
| tree | b7df739f0cb01abf87bd6cae9cd55bb26920fc94 /CMakeLists.txt | |
| parent | 74e4ebe74b307d65d9064357cbf80855afbe059b (diff) | |
| parent | ea85d58bc9d619e1511b40a16a630c5da9e60a42 (diff) | |
| download | libept-c5dd516802af50f8e369e9f520b88dcf28dc77df.tar.gz | |
Merge branch 'notagcoll': removed dependencies on tagcoll and wibble.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ddf7bb9..9b693c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,9 +3,9 @@ cmake_minimum_required(VERSION 3.2) include( FindPkgConfig ) include( FindDoxygen ) -add_custom_target( unit ) +add_custom_target(check COMMAND ${CMAKE_SOURCE_DIR}/run-check ${CMAKE_BINARY_DIR}/ept/test-ept) -set( EPT_VERSION "1.0.14" ) +set( EPT_VERSION "1.1" ) # Get the soversion from libapt-pkg to include in our own execute_process( @@ -22,32 +22,6 @@ set( APT_INCLUDES "/usr/include/" CACHE STRING "apt include path" ) set( APT_LINKDIRS "/usr/lib/" CACHE STRING "apt library path" ) set( OPT_FLAGS "-O0 -g" CACHE STRING "optimization level" ) -option( INTERNAL_TAGCOLL "use internal copy of tagcoll" ) -option( INTERNAL_WIBBLE "use internal copy of wibble" ) -option( RPM "using apt-rpm" ) - -if( INTERNAL_WIBBLE ) - add_subdirectory( wibble ) - set( WIBBLE_INCLUDE_DIRS ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ) - set( WIBBLE_LIBRARY_DIRS ${wibble_BINARY_DIR} ) - set( WIBBLE_LIBRARIES "wibble" ) - set( WIBBLE_TEST_CMAKE "${wibble_SOURCE_DIR}/test.cmake" ) -else( INTERNAL_WIBBLE ) - pkg_check_modules( WIBBLE REQUIRED "libwibble >= 1.0" ) - find_program( WIBBLE_TEST_GENRUNNER wibble-test-genrunner ) - set( WIBBLE_TEST_CMAKE "${WIBBLE_PREFIX}/share/wibble/test.cmake" ) -endif( INTERNAL_WIBBLE ) - -if( INTERNAL_TAGCOLL ) - set( TAGCOLL_FOUND ON ) - set( TAGCOLL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR} ) - set( TAGCOLL_LIBRARY_DIRS ${tagcoll_BINARY_DIR} ) - set( TAGCOLL_LIBRARIES "tagcoll2" ) - add_subdirectory( tagcoll ) -else( INTERNAL_TAGCOLL ) - pkg_check_modules( TAGCOLL REQUIRED "libtagcoll2 >= 2.0" ) -endif( INTERNAL_TAGCOLL ) - add_subdirectory( ept ) add_subdirectory( tools ) add_subdirectory( doc ) |