Skip to content

Commit 7e1913d

Browse files
committed
Merge branch 'master' into issues_AD
2 parents b8e1b45 + 88d512b commit 7e1913d

File tree

4 files changed

+31
-1
lines changed

4 files changed

+31
-1
lines changed

.github/CONTRIBUTING.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
TODO: Contribution guide. Follow this example:
2+
3+
https://github.com/atom/atom/blob/master/CONTRIBUTING.md
4+
5+
TODO add contribution guidelines. These could include:
6+
7+
Steps for creating good issues or pull requests.
8+
Links to external documentation, mailing lists, or a code of conduct.
9+
Community and behavioral expectations.

.github/ISSUE_TEMPLATE.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
TODO
2+
3+
In the new file, add your issue template. This could include:
4+
5+
Expected behavior and actual behavior.
6+
Steps to reproduce the problem.
7+
Specifications like the version of the project, operating system, or hardware.
8+
9+
Example:
10+
https://github.com/atom/atom/blob/master/ISSUE_TEMPLATE.md

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
TODO
2+
3+
In the new file, add your pull request template. This could include:
4+
5+
A reference to a related issue in your repository.
6+
A description of the changes proposed in the pull request.
7+
@mentions of the person or team responsible for reviewing proposed changes.
8+

src/Main/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,19 +275,22 @@ ELSE()
275275
WORKING_DIRECTORY ${SCIRun_BINARY_DIR})
276276
ENDIF()
277277

278+
IF(NOT BUILD_HEADLESS)
278279
# Note: installer is created from Release build only!
279280
GET_FILENAME_COMPONENT(QTCORENAME ${QT_QTCORE_LIBRARY_RELEASE} NAME_WE)
280281
GET_FILENAME_COMPONENT(QTGUINAME ${QT_QTGUI_LIBRARY_RELEASE} NAME_WE)
281282
GET_FILENAME_COMPONENT(QTOPENGLNAME ${QT_QTOPENGL_LIBRARY_RELEASE} NAME_WE)
282283
GET_FILENAME_COMPONENT(QTNETWORKNAME ${QT_QTNETWORK_LIBRARY_RELEASE} NAME_WE)
283-
284+
ENDIF()
284285
INSTALL(TARGETS ${APPLICATION_NAME} RUNTIME DESTINATION bin)
286+
IF(NOT BUILD_HEADLESS)
285287
INSTALL(PROGRAMS
286288
${QT_BINARY_DIR}/${QTCORENAME}.dll
287289
${QT_BINARY_DIR}/${QTGUINAME}.dll
288290
${QT_BINARY_DIR}/${QTOPENGLNAME}.dll
289291
${QT_BINARY_DIR}/${QTNETWORKNAME}.dll
290292
DESTINATION bin)
293+
ENDIF()
291294
IF(BUILD_WITH_PYTHON)
292295
INSTALL(PROGRAMS
293296
${SCI_PYTHON_DLL_PATH}

0 commit comments

Comments
 (0)