diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2015-11-17 17:52:49 -0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-12-16 07:59:01 -0800 |
| commit | 126d9a00e41607fc4c1eb20edcbe17529c09ef38 (patch) | |
| tree | 87b4574a90235fefeb583019507c7f815a109a5a | |
| parent | 65cecad564929e25940ba0b5e9d61c9024da49a8 (diff) | |
| download | subsurface-126d9a00e41607fc4c1eb20edcbe17529c09ef38.tar.gz | |
Added HandleFindLibDiveComputer.cmake
Anoter attempt to clear the Main CMakeLists.txt file
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | cmake/Modules/HandleFindLibDiveComputer.cmake | 7 |
2 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a0716ea6..d28678345 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,6 +87,7 @@ include(cmake/Modules/pkgconfig_helper.cmake) # if you think a module miss anything, take a look on the specific # module file. include(cmake/Modules/HandleFindGit2.cmake) +include(cmake/Modules/HandleFindLibDiveComputer.cmake) pkg_config_library(LIBXML libxml-2.0 REQUIRED) pkg_config_library(LIBSQLITE3 sqlite3 REQUIRED) @@ -99,14 +100,6 @@ if(SMARTTRAK_IMPORT) pkg_config_library(LIBMDB libmdb REQUIRED) endif() -if(LIBDC_FROM_PKGCONFIG) - pkg_config_library(LIBDC libdivecomputer REQUIRED) - set(LIBDIVECOMPUTER_LIBRARIES "") -else() - find_package(Libdivecomputer REQUIRED) - include_directories(${LIBDIVECOMPUTER_INCLUDE_DIR}) -endif() - # setup marble if(NOT NO_MARBLE) diff --git a/cmake/Modules/HandleFindLibDiveComputer.cmake b/cmake/Modules/HandleFindLibDiveComputer.cmake new file mode 100644 index 000000000..2f5bfeb32 --- /dev/null +++ b/cmake/Modules/HandleFindLibDiveComputer.cmake @@ -0,0 +1,7 @@ +if(LIBDC_FROM_PKGCONFIG) + pkg_config_library(LIBDC libdivecomputer REQUIRED) + set(LIBDIVECOMPUTER_LIBRARIES "") +else() + find_package(Libdivecomputer REQUIRED) + include_directories(${LIBDIVECOMPUTER_INCLUDE_DIR}) +endif() |