From b0dcd0c5ae5bdc737858d7d611988de504be0cc3 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Wed, 21 Jan 2015 13:35:27 -0500 Subject: [PATCH] Add top-level cmake file for packaging. Update existing cmake configuration to permit running cmake from top. --- CMakeLists.txt | 2 ++ json_gssapi/CMakeLists.txt | 2 +- json_gssapi/test/CMakeLists.txt | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..ff7b17f --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,2 @@ +cmake_minimum_required(VERSION 2.8) +add_subdirectory(json_gssapi) diff --git a/json_gssapi/CMakeLists.txt b/json_gssapi/CMakeLists.txt index ec12cbd..96cb23c 100644 --- a/json_gssapi/CMakeLists.txt +++ b/json_gssapi/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8) include(GenerateExportHeader) project(json_gssapi) -include_directories(src/ ${CMAKE_CURRENT_BINARY_DIR}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/ ${CMAKE_CURRENT_BINARY_DIR}) add_library(jsongssapi SHARED src/datamodel/GSSDisplayStatus.cpp diff --git a/json_gssapi/test/CMakeLists.txt b/json_gssapi/test/CMakeLists.txt index c2998e4..e4d6be3 100644 --- a/json_gssapi/test/CMakeLists.txt +++ b/json_gssapi/test/CMakeLists.txt @@ -1,5 +1,5 @@ -include_directories(${CMAKE_SOURCE_DIR}/src) -include_directories(${CMAKE_SOURCE_DIR}/src/commands) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../src) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../src/commands) find_package (PkgConfig) pkg_check_modules (GLIB2 glib-2.0) -- 2.1.4