cmake: allow VILLASnode to be included into other CMake projects via add_subdirectory()

CMakeLists.txt

@@ -130,7 +130,7 @@ set(PROJECT_SOVERSION 1)
 
 execute_process(
     COMMAND git describe --tags --abbrev=0 --match "v*"
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     OUTPUT_VARIABLE PROJECT_VERSION_STR
     OUTPUT_STRIP_TRAILING_WHITESPACE
 )
@@ -149,14 +149,14 @@ if(DEFINED ENV{CI})
 else()
     execute_process(
         COMMAND git rev-parse --short=7 HEAD
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         OUTPUT_VARIABLE GIT_REV
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
     
     execute_process(
         COMMAND git rev-parse --abbrev-ref HEAD
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         OUTPUT_VARIABLE GIT_BRANCH
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
@@ -173,11 +173,6 @@ endif()
 
 set(BUILDID "v${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}-${GIT_REV}-${VARIANT}")
 
-include_directories(
-    ${CMAKE_SOURCE_DIR}/include
-    ${CMAKE_BINARY_DIR}/include
-)
-
 add_subdirectory(etc)
 add_subdirectory(lib)
 add_subdirectory(src)
@@ -205,8 +200,8 @@ if(WITH_TESTS)
 endif()
 
 configure_file(
-    ${CMAKE_SOURCE_DIR}/include/villas/config.h.in
-    ${CMAKE_BINARY_DIR}/include/villas/config.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/villas/config.h.in
+    ${CMAKE_CURRENT_BINARY_DIR}/include/villas/config.h
 )
 
 # Show feature summary

cmake/VILLASnodePackaging.cmake

@@ -61,8 +61,8 @@ set(CPACK_RPM_PACKAGE_LICENSE "GPLv3")
 set(CPACK_RPM_PACKAGE_URL "http://www.fein-aachen.org/projects/villas-node/")
 set(CPACK_RPM_PACKAGE_GROUP "Development/Libraries")
 
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING.md")
-set(CPACK_RESOURCE_FILE_README  "${CMAKE_SOURCE_DIR}/README.md")
+set(CPACK_RESOURCE_FILE_LICENSE "${VILLASnode_SOURCE_DIR}/COPYING.md")
+set(CPACK_RESOURCE_FILE_README  "${VILLASnode_SOURCE_DIR}/README.md")
 
 set(CPACK_SOURCE_IGNORE_FILES "build/;\\\\.gitmodules;\\\\.git/;\\\\.vscode;\\\\.editorconfig;\\\\.gitlab-ci.yml;\\\\.(docker|git)ignore;\\\\.DS_Store")
 

doc/CMakeLists.txt

@@ -53,7 +53,7 @@ if(DOXYGEN_FOUND)
 
 	doxygen_add_docs(doc
 		README.md CONTRIBUTING.md COPYING.md src/ lib/ tests/ include/ doc/
-		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+		WORKING_DIRECTORY ${PROJECT_DIR}
 	)
 
 	install(

lib/CMakeLists.txt

@@ -22,10 +22,12 @@
 
 add_compile_options(-fPIC)
 
-set(INCLUDE_DIRS
+list(APPEND INCLUDE_DIRS
     ${JANSSON_INCLUDE_DIRS}
     ${OPENSSL_INCLUDE_DIR}
     ${CURL_INCLUDE_DIRS}
+    ${VILLASnode_BINARY_DIR}/include
+    ${VILLASnode_SOURCE_DIR}/include
 )
 
 set(LIBRARIES

lib/api/CMakeLists.txt

@@ -21,14 +21,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###################################################################################
 
-set(INCLUDE_DIRS
-    ${OPENSSL_INCLUDE_DIR}
-)
-
-set(LIBRARIES
-    ${OPENSSL_LIBRARIES}
-)
-
 set(API_SRC
     session.c
     actions/capabiltities.c

lib/formats/CMakeLists.txt

@@ -20,7 +20,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###################################################################################
 
-set(FORMAT_SRC
+list(APPEND FORMAT_SRC
     json.c
     json_reserve.c
     villas_binary.c
@@ -30,14 +30,6 @@ set(FORMAT_SRC
     msg.c
 )
 
-set(INCLUDE_DIRS
-    ${OPENSSL_INCLUDE_DIR}
-)
-
-set(LIBRARIES
-    ${OPENSSL_LIBRARIES}
-)
-
 # Enable Google Protobuf format
 if(PROTOBUFC_FOUND)
     list(APPEND FORMAT_SRC

lib/hooks/CMakeLists.txt

@@ -20,14 +20,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###################################################################################
 
-set(INCLUDE_DIRS
-    ${JANSSON_INCLUDE_DIRS}
-)
-
-set(LIBRARIES
-    PkgConfig::JANSSON
-)
-
 set(HOOK_SRC
     convert.c
     decimate.c

lib/nodes/CMakeLists.txt

@@ -20,14 +20,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###################################################################################
 
-set(INCLUDE_DIRS
-    ${JANSSON_INCLUDE_DIRS}
-)
-
-set(LIBRARIES
-    PkgConfig::JANSSON
-)
-
 set(NODE_SRC
     influxdb.c
     stats.c

packaging/docker/CMakeLists.txt

@@ -33,7 +33,7 @@ set(DOCKER_RUN_OPTS
 	--publish 2345:2345
 	--privileged
 	--security-opt seccomp:unconfined
-	--volume \"${CMAKE_SOURCE_DIR}:/villas\"
+	--volume \"${VILLASnode_SOURCE_DIR}:/villas\"
 )
 
 foreach(SUFFIX app dev dev-centos dev-ubuntu)
@@ -59,7 +59,7 @@ foreach(SUFFIX app dev dev-centos dev-ubuntu)
 			--build-arg GIT_REV=${GIT_REV}
 			--build-arg VERSION=${PROJECT_VERSION}
 			--build-arg VARIANT=${VARIANT}
-			${DOCKER_BUILD_OPTS} ${CMAKE_SOURCE_DIR}
+			${DOCKER_BUILD_OPTS} ${VILLASnode_SOURCE_DIR}
 		COMMENT "Build Docker image: ${DOCKER_IMAGE}-${SUFFIX}:${DOCKER_TAG}"
 	)
 

plugins/CMakeLists.txt

@@ -22,7 +22,6 @@
 
 # Plugins
 link_libraries(villas)
-include_directories("${CMAKE_SOURCE_DIR}/include")
 add_definitions("-DVILLAS")
 
 add_library(simple_circuit MODULE models/simple_circuit.c)