diff options
| author | nOOb3167 <nOOb3167@gmail.com> | 2018-02-19 14:57:01 +0100 |
|---|---|---|
| committer | SmallJoker <SmallJoker@users.noreply.github.com> | 2018-02-23 17:02:02 +0100 |
| commit | cbf891ef1db7d3b3d1155916c100011d3e9a94cd (patch) | |
| tree | 3e26725c986a58e32f49aef2602de2ecb9017759 | |
| parent | 57418111a8352f2d6dabf1d3e43c1719f4b118c0 (diff) | |
| download | minetest-cbf891ef1db7d3b3d1155916c100011d3e9a94cd.tar.gz minetest-cbf891ef1db7d3b3d1155916c100011d3e9a94cd.tar.bz2 minetest-cbf891ef1db7d3b3d1155916c100011d3e9a94cd.zip | |
CMakeLists pass windows sources (manifest and resource file) to executable targets separately from common_SRCS
| -rw-r--r-- | src/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c2b28832a..e7759b7a7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -471,9 +471,9 @@ if(WIN32) -o ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${WINRESOURCE_FILE}) - SET(common_SRCS ${common_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o) + SET(extra_windows_SRCS ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o) else(MINGW) # Probably MSVC - set(common_SRCS ${common_SRCS} ${WINRESOURCE_FILE} ${MINETEST_EXE_MANIFEST_FILE}) + set(extra_windows_SRCS ${WINRESOURCE_FILE} ${MINETEST_EXE_MANIFEST_FILE}) endif(MINGW) endif() @@ -561,7 +561,7 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin") if(BUILD_CLIENT) - add_executable(${PROJECT_NAME} ${client_SRCS}) + add_executable(${PROJECT_NAME} ${client_SRCS} ${extra_windows_SRCS}) add_dependencies(${PROJECT_NAME} GenerateVersion) set(client_LIBS ${PROJECT_NAME} @@ -629,7 +629,7 @@ endif(BUILD_CLIENT) if(BUILD_SERVER) - add_executable(${PROJECT_NAME}server ${server_SRCS}) + add_executable(${PROJECT_NAME}server ${server_SRCS} ${extra_windows_SRCS}) add_dependencies(${PROJECT_NAME}server GenerateVersion) target_link_libraries( ${PROJECT_NAME}server |