Commit b1fecd0d authored by Jozef Izso's avatar Jozef Izso

Include file information in all DLL and EXE outputs

parent 3415201d
...@@ -48,9 +48,12 @@ set(libprotobuf_lite_includes ...@@ -48,9 +48,12 @@ set(libprotobuf_lite_includes
${protobuf_source_dir}/src/google/protobuf/wire_format_lite.h ${protobuf_source_dir}/src/google/protobuf/wire_format_lite.h
) )
set(libprotobuf_lite_rc_files
${CMAKE_CURRENT_BINARY_DIR}/version.rc
)
add_library(libprotobuf-lite ${protobuf_SHARED_OR_STATIC} add_library(libprotobuf-lite ${protobuf_SHARED_OR_STATIC}
${libprotobuf_lite_files} ${libprotobuf_lite_includes} ${libprotobuf_lite_files} ${libprotobuf_lite_includes} ${libprotobuf_lite_rc_files})
${CMAKE_CURRENT_BINARY_DIR}/version.rc)
target_link_libraries(libprotobuf-lite ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(libprotobuf-lite ${CMAKE_THREAD_LIBS_INIT})
target_include_directories(libprotobuf-lite PUBLIC ${protobuf_source_dir}/src) target_include_directories(libprotobuf-lite PUBLIC ${protobuf_source_dir}/src)
if(MSVC AND protobuf_BUILD_SHARED_LIBS) if(MSVC AND protobuf_BUILD_SHARED_LIBS)
......
...@@ -112,8 +112,12 @@ set(libprotobuf_includes ...@@ -112,8 +112,12 @@ set(libprotobuf_includes
${protobuf_source_dir}/src/google/protobuf/wrappers.pb.h ${protobuf_source_dir}/src/google/protobuf/wrappers.pb.h
) )
set(libprotobuf_rc_files
${CMAKE_CURRENT_BINARY_DIR}/version.rc
)
add_library(libprotobuf ${protobuf_SHARED_OR_STATIC} add_library(libprotobuf ${protobuf_SHARED_OR_STATIC}
${libprotobuf_lite_files} ${libprotobuf_files} ${libprotobuf_includes}) ${libprotobuf_lite_files} ${libprotobuf_files} ${libprotobuf_includes} ${libprotobuf_rc_files})
target_link_libraries(libprotobuf ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(libprotobuf ${CMAKE_THREAD_LIBS_INIT})
if(protobuf_WITH_ZLIB) if(protobuf_WITH_ZLIB)
target_link_libraries(libprotobuf ${ZLIB_LIBRARIES}) target_link_libraries(libprotobuf ${ZLIB_LIBRARIES})
......
...@@ -161,6 +161,10 @@ set(libprotoc_headers ...@@ -161,6 +161,10 @@ set(libprotoc_headers
${protobuf_source_dir}/src/google/protobuf/compiler/zip_writer.h ${protobuf_source_dir}/src/google/protobuf/compiler/zip_writer.h
) )
set(libprotoc_rc_files
${CMAKE_CURRENT_BINARY_DIR}/version.rc
)
set(js_well_known_types_sources set(js_well_known_types_sources
${protobuf_source_dir}/src/google/protobuf/compiler/js/well_known_types/any.js ${protobuf_source_dir}/src/google/protobuf/compiler/js/well_known_types/any.js
${protobuf_source_dir}/src/google/protobuf/compiler/js/well_known_types/struct.js ${protobuf_source_dir}/src/google/protobuf/compiler/js/well_known_types/struct.js
...@@ -174,7 +178,7 @@ add_custom_command( ...@@ -174,7 +178,7 @@ add_custom_command(
) )
add_library(libprotoc ${protobuf_SHARED_OR_STATIC} add_library(libprotoc ${protobuf_SHARED_OR_STATIC}
${libprotoc_files} ${libprotoc_headers}) ${libprotoc_files} ${libprotoc_headers} ${libprotoc_rc_files})
target_link_libraries(libprotoc libprotobuf) target_link_libraries(libprotoc libprotobuf)
if(MSVC AND protobuf_BUILD_SHARED_LIBS) if(MSVC AND protobuf_BUILD_SHARED_LIBS)
target_compile_definitions(libprotoc target_compile_definitions(libprotoc
......
...@@ -2,7 +2,11 @@ set(protoc_files ...@@ -2,7 +2,11 @@ set(protoc_files
${protobuf_source_dir}/src/google/protobuf/compiler/main.cc ${protobuf_source_dir}/src/google/protobuf/compiler/main.cc
) )
add_executable(protoc ${protoc_files} ${CMAKE_CURRENT_BINARY_DIR}/version.rc) set(protoc_rc_files
${CMAKE_CURRENT_BINARY_DIR}/version.rc
)
add_executable(protoc ${protoc_files} ${protoc_rc_files})
target_link_libraries(protoc libprotobuf libprotoc) target_link_libraries(protoc libprotobuf libprotoc)
add_executable(protobuf::protoc ALIAS protoc) add_executable(protobuf::protoc ALIAS protoc)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment