update

Author: markaren

CMakeLists.txt

@@ -14,11 +14,13 @@ option(FMU4CPP_BUILD_TESTS "Build internal tests" OFF)
 
 set(CMAKE_CXX_STANDARD 17)
 
+set(generatedSourcesDir "${CMAKE_BINARY_DIR}/generated")
+
 
 ############modelIdentifier and export version###########
 
 set(modelIdentifier identity) # <-- CHANGE ME
-set(fmi_version "fmi2" "fmi3") # fmi2 and fmi3 is supported
+set(fmi_version "fmi2") # fmi2 and fmi3 is supported
 
 ########################################################
 

cmake/generate_fmu.cmake

@@ -21,8 +21,6 @@ function(generateFMU modelIdentifier)
     target_include_directories(${modelIdentifier} PUBLIC "${PROJECT_SOURCE_DIR}/export/include")
     set_target_properties(${modelIdentifier} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
-    set(generatedSourcesDir "${CMAKE_BINARY_DIR}/generated")
-
     foreach (fmiVersion IN LISTS FMU_FMI_VERSIONS)
 
         # versioned shared library target built from object libraries

export/src/CMakeLists.txt

@@ -1,4 +1,3 @@
-set(generatedSourcesDir "${CMAKE_BINARY_DIR}/generated")
 
 set(lib_info "${generatedSourcesDir}/fmu4cpp/lib_info.cpp")
 configure_file(

src/CMakeLists.txt

@@ -9,4 +9,4 @@ generateFMU("${modelIdentifier}" FMI_VERSIONS ${fmi_version} RESOURCE_FOLDER "${
 
 # write the identifier to file so that the CI process knows what to package
 set(OUTPUT_FILE "${CMAKE_BINARY_DIR}/model.txt")
-file(WRITE ${OUTPUT_FILE} "${modelIdentifier}")
+file(WRITE ${OUTPUT_FILE} "${fmi_version}/${modelIdentifier}")