Skip to content

Commit f81b45d

Browse files
[Windows Setup] ecal_generate_config.exe is now shipped as release-build (#2435)
1 parent ce867f8 commit f81b45d

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

cpack/innosetup/ecal_setup.iss.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,12 @@ Source: "{#ComponentStagingDir}\_configuration\etc\ecal.yaml"; DestDir: "{app
8686
Source: "{#ComponentStagingDir}\_configuration\etc\ecal.yaml"; DestDir: "{app}\etc\"; Tasks: replaceconf; Flags: ignoreversion skipifsourcedoesntexist; Components: runtime
8787
Source: "{#ComponentStagingDir}\_configuration\etc\ecaltime.yaml"; DestDir: "{app}\etc\"; Flags: ignoreversion skipifsourcedoesntexist; Components: runtime
8888

89+
8990
Source: "{#CSharpStagingDir}\runtime\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: runtime
9091

9192
; applications
9293
Source: "{#ComponentStagingDir}\app\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: applications
94+
Source: "{#ComponentStagingDir}\configuration\bin\*"; DestDir: "{app}\bin\"; Flags: ignoreversion recursesubdirs; Components: applications
9395

9496
; samples
9597
Source: "{#ComponentStagingDir}\samples\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: samples

ecal/core/cfg/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,8 @@ if(ECAL_DEFAULT_CONFIG_LOCATION AND NOT CMAKE_CROSSCOMPILING)
9898
endif()
9999
endif()
100100

101-
ecal_install_app(${PROJECT_NAME})
101+
install(TARGETS ${PROJECT_NAME}
102+
RUNTIME
103+
DESTINATION "${eCAL_install_app_dir}" # Install to the App-dir...
104+
COMPONENT configuration # ... but as component "configuration"
105+
)

0 commit comments

Comments
 (0)