diff --git a/cpack/innosetup/ecal_setup.iss.in b/cpack/innosetup/ecal_setup.iss.in index a09074936e..ebed534d93 100644 --- a/cpack/innosetup/ecal_setup.iss.in +++ b/cpack/innosetup/ecal_setup.iss.in @@ -86,10 +86,12 @@ Source: "{#ComponentStagingDir}\_configuration\etc\ecal.yaml"; DestDir: "{app Source: "{#ComponentStagingDir}\_configuration\etc\ecal.yaml"; DestDir: "{app}\etc\"; Tasks: replaceconf; Flags: ignoreversion skipifsourcedoesntexist; Components: runtime Source: "{#ComponentStagingDir}\_configuration\etc\ecaltime.yaml"; DestDir: "{app}\etc\"; Flags: ignoreversion skipifsourcedoesntexist; Components: runtime + Source: "{#CSharpStagingDir}\runtime\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: runtime ; applications Source: "{#ComponentStagingDir}\app\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: applications +Source: "{#ComponentStagingDir}\configuration\bin\*"; DestDir: "{app}\bin\"; Flags: ignoreversion recursesubdirs; Components: applications ; samples Source: "{#ComponentStagingDir}\samples\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: samples diff --git a/ecal/core/cfg/CMakeLists.txt b/ecal/core/cfg/CMakeLists.txt index f16da6d559..3a14094db3 100644 --- a/ecal/core/cfg/CMakeLists.txt +++ b/ecal/core/cfg/CMakeLists.txt @@ -98,4 +98,8 @@ if(ECAL_DEFAULT_CONFIG_LOCATION AND NOT CMAKE_CROSSCOMPILING) endif() endif() -ecal_install_app(${PROJECT_NAME}) \ No newline at end of file +install(TARGETS ${PROJECT_NAME} + RUNTIME + DESTINATION "${eCAL_install_app_dir}" # Install to the App-dir... + COMPONENT configuration # ... but as component "configuration" +) \ No newline at end of file