diff options
| author | Patric Matters <Patrick.Matters@bmw.de> | 2015-03-17 20:54:10 +0100 |
|---|---|---|
| committer | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2015-03-23 14:41:30 +0100 |
| commit | 3ff3fcb0434d12d9f4a9ba3715bab761c4f710a0 (patch) | |
| tree | aa514329c31db75c5b130fe9d66463ac55acea59 | |
| parent | 9a70eef3ee739543b87c867fd5b643b703899c89 (diff) | |
| download | DLT-daemon-3ff3fcb0434d12d9f4a9ba3715bab761c4f710a0.tar.gz | |
Made zlib dependent on DLT_SYSTEM. Doxygen paths are now determined by CMake.
Signed-off-by: Patrick Matters <Patrick.Matters@bmw.de>
Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | doc/doxygen.cfg.cmake | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d55e82f..8d82891 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,7 +72,9 @@ set( LICENSE "Mozilla Public License Version 2.0" ) # Build, project and include settings find_package(Threads REQUIRED) -find_package(ZLIB REQUIRED) +if(WITH_DLT_SYSTEM) + find_package(ZLIB REQUIRED) +endif(WITH_DLT_SYSTEM) find_package(PkgConfig) if(WITH_DLT_DBUS) diff --git a/doc/doxygen.cfg.cmake b/doc/doxygen.cfg.cmake index 13eec96..d5f44d0 100755 --- a/doc/doxygen.cfg.cmake +++ b/doc/doxygen.cfg.cmake @@ -573,9 +573,9 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = ./../../doc/mainpage.h \ - ./../../src/ \ - ./../../include +INPUT = @CMAKE_SOURCE_DIR@/doc/mainpage.h \ + @CMAKE_SOURCE_DIR@/src/ \ + @CMAKE_SOURCE_DIR@/include # This tag can be used to specify the character encoding of the source files |