Add top-level cmake file for packaging.

Update existing cmake configuration to permit running cmake from top.

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644 (file)
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 (file)
--- 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 (file)
--- 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)