Skip to content

Commit 4783ff9

Browse files
sfan5nerzhul
authored andcommittedJun 14, 2017
Update list of installed files concerning server and non-RUN_IN_PLACE builds (#5976)
* mods/mods_here.txt should be present on servers * client/serverlist/ can be omitted for RUN_IN_PLACE=0 * clientmods/ is not used on servers
1 parent 683ab3a commit 4783ff9

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed
 

Diff for: ‎CMakeLists.txt

+10-6
Original file line numberDiff line numberDiff line change
@@ -157,16 +157,20 @@ endif()
157157

158158

159159
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builtin" DESTINATION "${SHAREDIR}")
160-
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/client" DESTINATION "${SHAREDIR}")
161-
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/clientmods" DESTINATION "${SHAREDIR}")
160+
if(RUN_IN_PLACE)
161+
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/mods/mods_here.txt" DESTINATION "${SHAREDIR}/mods")
162+
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/textures/texture_packs_here.txt" DESTINATION "${SHAREDIR}/textures")
163+
endif()
164+
162165
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games" DESTINATION "${SHAREDIR}" PATTERN ".git*" EXCLUDE)
163166

164167
if(BUILD_CLIENT)
168+
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/client/shaders" DESTINATION "${SHAREDIR}/client")
165169
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/textures/base/pack" DESTINATION "${SHAREDIR}/textures/base")
166-
endif()
167-
if(RUN_IN_PLACE)
168-
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/mods/mods_here.txt" DESTINATION "${SHAREDIR}/mods")
169-
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/textures/texture_packs_here.txt" DESTINATION "${SHAREDIR}/textures")
170+
if(RUN_IN_PLACE)
171+
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/clientmods" DESTINATION "${SHAREDIR}")
172+
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/client/serverlist" DESTINATION "${SHAREDIR}/client")
173+
endif()
170174
endif()
171175

172176
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/fonts" DESTINATION "${SHAREDIR}")

0 commit comments

Comments
 (0)
Please sign in to comment.