[generateFMU] support optional resourceFolder

Author: markaren

cmake/generate_fmu.cmake

@@ -1,5 +1,14 @@
 
-function(generateFMU modelIdentifier fmiVersion resourceFolder)
+function(generateFMU modelIdentifier fmiVersion)
+
+    set(options)
+    set(oneValueArgs RESOURCE_FOLDER)
+    set(multiValueArgs)
+    cmake_parse_arguments(FMU "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    if (NOT FMU_RESOURCE_FOLDER)
+        set(FMU_RESOURCE_FOLDER "")
+    endif()
 
     target_sources(${modelIdentifier} PRIVATE "$<TARGET_OBJECTS:fmu4cpp_base>")
 
@@ -66,17 +75,17 @@ function(generateFMU modelIdentifier fmiVersion resourceFolder)
             WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
             COMMAND descriptionGenerator ${modelIdentifier} "${outputDir}/$<TARGET_FILE_NAME:${modelIdentifier}>")
 
-    if (resourceFolder STREQUAL "")
+    if (FMU_RESOURCE_FOLDER STREQUAL "")
         add_custom_command(TARGET ${modelIdentifier} POST_BUILD
                 WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/${modelIdentifier}"
                 COMMAND ${CMAKE_COMMAND} -E tar "c" "${modelIdentifier}.fmu" --format=zip
                 "${CMAKE_BINARY_DIR}/${modelIdentifier}/binaries"
                 "${CMAKE_BINARY_DIR}/${modelIdentifier}/modelDescription.xml")
 
     else ()
-        message("[generateFMU] Using resourceFolder=${resourceFolder} for model with identifier='${modelIdentifier}'")
+        message("[generateFMU] Using resourceFolder=${FMU_RESOURCE_FOLDER} for model with identifier='${modelIdentifier}'")
 
-        file(COPY "${resourceFolder}/" DESTINATION "${CMAKE_BINARY_DIR}/${modelIdentifier}/resources")
+        file(COPY "${FMU_RESOURCE_FOLDER}/" DESTINATION "${CMAKE_BINARY_DIR}/${modelIdentifier}/resources")
 
         add_custom_command(TARGET ${modelIdentifier} POST_BUILD
                 WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/${modelIdentifier}"

export/examples/BouncingBall/CMakeLists.txt

@@ -3,4 +3,4 @@ add_library(bouncing_ball SHARED
         "bouncing_ball.cpp"
 )
 
-generateFMU("bouncing_ball" "fmi3" "")
+generateFMU("bouncing_ball" "fmi3")

export/examples/Resource/CMakeLists.txt

@@ -3,4 +3,4 @@ add_library(resource SHARED
         "resource.cpp"
 )
 
-generateFMU("resource" "fmi2" "${CMAKE_CURRENT_SOURCE_DIR}/resources")
+generateFMU("resource" "fmi2" RESOURCE_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/resources")

export/examples/SimplePendulum/CMakeLists.txt

@@ -3,4 +3,4 @@ add_library(simple_pendulum SHARED
         "simple_pendulum.cpp"
 )
 
-generateFMU(simple_pendulum "fmi2" "")
+generateFMU(simple_pendulum "fmi2")

src/CMakeLists.txt

@@ -5,7 +5,7 @@ add_library(${modelIdentifier} SHARED
 )
 
 # Generate FMU
-generateFMU("${modelIdentifier}" ${fmi_version} "${PROJECT_SOURCE_DIR}/resources")
+generateFMU("${modelIdentifier}" ${fmi_version} RESOURCE_FOLDER "${PROJECT_SOURCE_DIR}/resources")
 
 # write the identifier to file so that the CI process knows what to package
 set(OUTPUT_FILE "${CMAKE_BINARY_DIR}/model.txt")