Merge pull request #81 from capitalistspz/master

No longer require manually setting include path in dependants

Author: vonnieda

CMakeLists.txt

@@ -54,16 +54,16 @@ else(CMAKE_BUILD_TYPE MATCHES Release)
     add_definitions(-D__BUILDTYPE__="debug")
 endif(CMAKE_BUILD_TYPE MATCHES Release)
 
-
-# add include directory 
-include_directories(include)
-
 # create our capture library
 add_library(openpnp-capture SHARED common/libmain.cpp
                                    common/context.cpp
                                    common/logging.cpp
                                    common/stream.cpp)
 
+target_include_directories(openpnp-capture PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:include>
+)
 # define common properties
 set_target_properties(openpnp-capture PROPERTIES
                       VERSION ${OPENPNP_CAPTURE_LIB_VERSION}

QtCaptureTest/QtCaptureTest.pro

@@ -14,9 +14,6 @@ TEMPLATE = app
 macx:CONFIG -= app_bundle
 #CONFIG += console
 
-# add the openpnp-capture include path
-INCLUDEPATH += ../include
-
 SOURCES += main.cpp\
         mainwindow.cpp
 

linux/tests/CMakeLists.txt

@@ -15,9 +15,6 @@ project (openpnp-capture-test)
 
 set (SOURCE main.cpp ../../common/logging.cpp)
 
-# add include directory 
-include_directories(../include ..)
-
 add_executable(openpnp-capture-test ${SOURCE})
 
 target_link_libraries(openpnp-capture-test openpnp-capture)

mac/tests/CMakeLists.txt

@@ -13,9 +13,6 @@
 cmake_minimum_required(VERSION 3.0)
 project (openpnp-capture-test)
 
-# add include directory 
-include_directories(../include ..)
-
 set (SOURCE main.cpp ../../common/logging.cpp)
 
 add_executable(openpnp-capture-test ${SOURCE})

win/tests/CMakeLists.txt

@@ -13,9 +13,6 @@
 cmake_minimum_required(VERSION 3.0)
 project (openpnp-capture-test)
 
-# add include directory 
-include_directories(../include ..)
-
 set (SOURCE main.cpp ../../common/logging.cpp)
 
 add_executable(openpnp-capture-test ${SOURCE})