Merge pull request #192 from dpacbach/fix-includes

Modernize CMake file with target-based includes.

CMakeLists.txt

@@ -192,11 +192,6 @@ IF(ENABLE_URL_SIGN MATCHES "ON")
  ENDIF(OPENSSL_FOUND)
 ENDIF(ENABLE_URL_SIGN MATCHES "ON")
 
-INCLUDE_DIRECTORIES("src")
-INCLUDE_DIRECTORIES("include")
-INCLUDE_DIRECTORIES("uthash")
-INCLUDE_DIRECTORIES("klib")
-
 SET(UCLSRC src/ucl_util.c
  src/ucl_parser.c
  src/ucl_emitter.c
@@ -213,7 +208,15 @@ IF (BUILD_SHARED_LIBS)
  SET (LIB_TYPE SHARED)
 ENDIF (BUILD_SHARED_LIBS)
 ADD_LIBRARY(ucl ${LIB_TYPE} ${UCLSRC})
+ADD_LIBRARY(ucl::ucl ALIAS ucl)
 SET_TARGET_PROPERTIES(ucl PROPERTIES VERSION ${LIBUCL_VERSION} SOVERSION ${LIBUCL_VERSION_MAJOR})
+TARGET_INCLUDE_DIRECTORIES(ucl
+ PUBLIC
+ include
+ PRIVATE
+ src
+ uthash
+ klib)
 
 IF(ENABLE_LUA MATCHES "ON")
  IF(ENABLE_LUAJIT MATCHES "ON")
@@ -236,12 +239,14 @@ IF(ENABLE_LUA MATCHES "ON")
  ENDIF(ENABLE_LUAJIT MATCHES "ON")
  SET(UCL_LUA_SRC lua/lua_ucl.c)
  ADD_LIBRARY(lua-ucl ${LIB_TYPE} ${UCL_LUA_SRC})
+ ADD_LIBRARY(ucl::lua ALIAS lua-ucl)
  IF(ENABLE_LUAJIT MATCHES "ON")
  TARGET_LINK_LIBRARIES(lua-ucl "${LUAJIT_LIBRARY}")
  ELSE(ENABLE_LUAJIT MATCHES "ON")
  TARGET_LINK_LIBRARIES(lua-ucl "${LUA_LIBRARY}")
  ENDIF(ENABLE_LUAJIT MATCHES "ON")
  TARGET_LINK_LIBRARIES(lua-ucl ucl)
+ TARGET_INCLUDE_DIRECTORIES(lua-ucl PUBLIC include PRIVATE src uthash)
  SET_TARGET_PROPERTIES(lua-ucl PROPERTIES VERSION ${LIBUCL_VERSION} SOVERSION ${LIBUCL_VERSION_MAJOR})
 ENDIF()