test

.lock-waf_linux_build

@@ -1,10 +1,10 @@
-argv = ['./waf', 'configure']
+argv = ['./waf', 'configure', '--with_protoc']
 config_cmd = 'configure'
-environ = {'SHELL': '/bin/bash', 'QT_ACCESSIBILITY': '1', 'COLORTERM': 'truecolor', 'XDG_CONFIG_DIRS': '/etc/xdg/xdg-i3:/etc/xdg', 'TERM_PROGRAM_VERSION': '1.82.2', 'XDG_CONFIG_DIRS_VSCODE_SNAP_ORIG': '/etc/xdg/xdg-i3:/etc/xdg', 'GTK_IM_MODULE': 'ibus', 'GDK_BACKEND_VSCODE_SNAP_ORIG': '', 'LANGUAGE': 'en_US:en', 'I3SOCK': '/run/user/1000/i3/ipc-socket.3565', 'GIO_MODULE_DIR_VSCODE_SNAP_ORIG': '', 'XMODIFIERS': '@im=ibus', 'DESKTOP_SESSION': 'i3', 'NO_AT_BRIDGE': '1', 'GTK_MODULES': 'gail:atk-bridge', 'XDG_SEAT': 'seat0', 'PWD': '/home/peteck/dev/protobuf', 'GSETTINGS_SCHEMA_DIR': '/home/peteck/snap/code/140/.local/share/glib-2.0/schemas', 'XDG_SESSION_DESKTOP': 'i3', 'LOGNAME': 'peteck', 'GTK_EXE_PREFIX': '/snap/code/140/usr', 'XDG_SESSION_TYPE': 'x11', 'GPG_AGENT_INFO': '/run/user/1000/gnupg/S.gpg-agent:0:1', 'SYSTEMD_EXEC_PID': '3421', 'CXX': '/usr/bin/clang++-12', 'XAUTHORITY': '/run/user/1000/gdm/Xauthority', 'VSCODE_GIT_ASKPASS_NODE': '/snap/code/140/usr/share/code/code', 'WINDOWPATH': '2', 'HOME': '/home/peteck', 'USERNAME': 'peteck', 'LANG': 'en_US.UTF-8', 'LS_COLORS': 'rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.webp=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:', 'XDG_CURRENT_DESKTOP': 'i3', 'GIT_ASKPASS': '/snap/code/140/usr/share/code/resources/app/extensions/git/dist/askpass.sh', 'CHROME_DESKTOP': 'code-url-handler.desktop', 'CLUTTER_IM_MODULE': 'ibus', 'VSCODE_GIT_ASKPASS_EXTRA_ARGS': '--ms-enable-electron-run-as-node', 'GSETTINGS_SCHEMA_DIR_VSCODE_SNAP_ORIG': '', 'GTK_IM_MODULE_FILE_VSCODE_SNAP_ORIG': '', 'LESSCLOSE': '/usr/bin/lesspipe %s %s', 'XDG_SESSION_CLASS': 'user', 'TERM': 'vt100', 'GTK_PATH': '/snap/code/140/usr/lib/x86_64-linux-gnu/gtk-3.0', 'LESSOPEN': '| /usr/bin/lesspipe %s', 'USER': 'peteck', 'GTK_PATH_VSCODE_SNAP_ORIG': '', 'VSCODE_GIT_IPC_HANDLE': '/run/user/1000/vscode-git-e505250194.sock', 'DISPLAY': ':0', 'SHLVL': '2', 'LOCPATH': '/snap/code/140/usr/lib/locale', 'QT_IM_MODULE': 'ibus', 'XDG_VTNR': '2', 'GTK_EXE_PREFIX_VSCODE_SNAP_ORIG': '', 'XDG_SESSION_ID': '2', 'XDG_RUNTIME_DIR': '/run/user/1000', 'XDG_DATA_DIRS_VSCODE_SNAP_ORIG': '/usr/share/i3:/usr/share/gnome:/usr/local/share/:/usr/share/:/var/lib/snapd/desktop', 'VSCODE_GIT_ASKPASS_MAIN': '/snap/code/140/usr/share/code/resources/app/extensions/git/dist/askpass-main.js', 'XDG_DATA_DIRS': '/home/peteck/snap/code/140/.local/share:/home/peteck/snap/code/140:/snap/code/140/usr/share:/usr/share/i3:/usr/share/gnome:/usr/local/share/:/usr/share/:/var/lib/snapd/desktop', 'GDK_BACKEND': 'x11', 'PATH': '/home/peteck/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/snap/bin:/usr/local/go/bin:/home/peteck/go/bin', 'CC': '/usr/bin/clang-12', 'GDMSESSION': 'i3', 'ORIGINAL_XDG_CURRENT_DESKTOP': 'i3', 'GTK_IM_MODULE_FILE': '/home/peteck/snap/code/common/.cache/immodules/immodules.cache', 'DBUS_SESSION_BUS_ADDRESS': 'unix:path=/run/user/1000/bus', 'LOCPATH_VSCODE_SNAP_ORIG': '', 'GIO_MODULE_DIR': '/home/peteck/snap/code/common/.cache/gio-modules', 'TERM_PROGRAM': 'vscode', '_': './waf'}
+environ = {'SHELL': '/bin/bash', 'QT_ACCESSIBILITY': '1', 'SNAP_REVISION': '250', 'XDG_CONFIG_DIRS': '/etc/xdg/xdg-i3:/etc/xdg', 'GTK_IM_MODULE': 'ibus', 'SNAP_REAL_HOME': '/home/peteck', 'TERMINAL_EMULATOR': 'JetBrains-JediTerm', 'SNAP_USER_COMMON': '/home/peteck/snap/clion/common', 'LANGUAGE': 'en_US:en', 'I3SOCK': '/run/user/1000/i3/ipc-socket.3485', 'TERM_SESSION_ID': '9ba1524b-53d9-4f8a-8802-777061e946f6', 'SNAP_INSTANCE_KEY': '', 'XMODIFIERS': '@im=ibus', 'DESKTOP_SESSION': 'i3', 'GTK_MODULES': 'gail:atk-bridge', 'XDG_SEAT': 'seat0', 'SNAP_EUID': '1000', 'PWD': '/home/peteck/dev/protobuf', 'XDG_SESSION_DESKTOP': 'i3', 'LOGNAME': 'peteck', 'XDG_SESSION_TYPE': 'x11', 'GPG_AGENT_INFO': '/run/user/1000/gnupg/S.gpg-agent:0:1', 'SYSTEMD_EXEC_PID': '3358', 'CXX': '/usr/bin/clang++-12', 'XAUTHORITY': '/run/user/1000/gdm/Xauthority', 'SNAP_CONTEXT': 'J6-u40jA9c2_NpUWZreb8rl-L23G_E7TsI2EEcBGI0D5uS2hAOol', 'WINDOWPATH': '2', 'HOME': '/home/peteck', 'USERNAME': 'peteck', 'LANG': 'en_US.UTF-8', 'LS_COLORS': 'rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.webp=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:', 'XDG_CURRENT_DESKTOP': 'i3', 'SNAP_ARCH': 'amd64', 'SNAP_INSTANCE_NAME': 'clion', 'SNAP_USER_DATA': '/home/peteck/snap/clion/250', 'SNAP_REEXEC': '', 'SNAP_UID': '1000', 'CLUTTER_IM_MODULE': 'ibus', 'LESSCLOSE': '/usr/bin/lesspipe %s %s', 'XDG_SESSION_CLASS': 'user', 'TERM': 'vt100', 'LESSOPEN': '| /usr/bin/lesspipe %s', 'USER': 'peteck', 'SNAP': '/snap/clion/250', 'SNAP_COMMON': '/var/snap/clion/common', 'SNAP_VERSION': '2023.2.2', 'DISPLAY': ':0', 'SHLVL': '2', 'SNAP_LIBRARY_PATH': '/var/lib/snapd/lib/gl:/var/lib/snapd/lib/gl32:/var/lib/snapd/void', 'SNAP_COOKIE': 'J6-u40jA9c2_NpUWZreb8rl-L23G_E7TsI2EEcBGI0D5uS2hAOol', 'QT_IM_MODULE': 'ibus', 'XDG_VTNR': '2', 'XDG_SESSION_ID': '2', 'SNAP_DATA': '/var/snap/clion/250', 'XDG_RUNTIME_DIR': '/run/user/1000', 'FIG_JETBRAINS_SHELL_INTEGRATION': '1', 'SNAP_NAME': 'clion', 'XDG_DATA_DIRS': '/usr/share/i3:/usr/share/gnome:/usr/local/share/:/usr/share/:/var/lib/snapd/desktop', 'PATH': '/home/peteck/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/snap/bin:/usr/local/go/bin:/home/peteck/go/bin', 'CC': '/usr/bin/clang-12', 'GDMSESSION': 'i3', 'DBUS_SESSION_BUS_ADDRESS': 'unix:path=/run/user/1000/bus', '_': './waf', 'OLDPWD': '/home/peteck/dev'}
 files = ['/home/peteck/dev/protobuf/resolve_symlinks/waf-tools/wscript', '/home/peteck/dev/protobuf/wscript']
-hash = b't\xf2\xe0\xbdT\xe5\x95\xcbN`=\x0b\x10\x80\x02\x15'
+hash = b'\x83\x82\x12\xe5N\x0e\xef*\x96\xc4\x1f\xcdq/\xd5\x18'
 launch_dir = '/home/peteck/dev/protobuf'
-options = {'colors': 'auto', 'jobs': 16, 'keep': 0, 'verbose': 0, 'zones': '', 'profile': 0, 'pdb': 0, 'whelp': 0, 'out': '', 'top': '', 'no_lock_in_run': '', 'no_lock_in_out': '', 'no_lock_in_top': '', 'prefix': '', 'bindir': None, 'libdir': None, 'progress_bar': 0, 'targets': '', 'files': '', 'destdir': '/home/peteck/dev/protobuf/protobuf_install', 'force': False, 'distcheck_args': None, 'no_resolve': False, 'skip_internal': False, 'standalone_archive': None, 'standalone_algo': 'zip', 'standalone_exclude': None, 'install_path': None, 'install_relative': None, 'install_shared_libs': None, 'install_static_libs': None, 'cxx_mkspec': None, 'cxx_debug': None, 'cxx_nodebug': None, 'cflags': None, 'cxxflags': None, 'linkflags': None, 'commonflags': None, 'android_sdk_dir': None, 'android_ndk_dir': None, 'ios_sdk_dir': None, 'ios_toolchain_dir': None, 'emscripten_path': None, 'poky_sdk_path': None, 'run_tests': None, 'run_silent': None, 'run_benchmarks': None, 'run_benchmark': None, 'print_benchmarks': None, 'print_benchmark_paths': None, 'run_cmd': None, 'result_file': None, 'result_folder': None, 'device_id': None, 'test_filter': None, 'ssh_runner': None, 'ssh_user': None, 'ssh_host': None, 'ssh_dest_dir': None, 'ssh_clean_dir': None, 'ssh_output_file': None, 'ssh_options': None, 'scp_options': None, 'with_protoc': None, 'resolve_path': None, 'git_protocol': None, 'symlinks_path': None, 'fast_resolve': None, 'lock_paths': None, 'lock_versions': None, 'waf_tools_path': None, 'waf_tools_checkout': None, 'protobuf_source_path': None, 'protobuf_source_checkout': None}
+options = {'colors': 'auto', 'jobs': 16, 'keep': 0, 'verbose': 0, 'zones': '', 'profile': 0, 'pdb': 0, 'whelp': 0, 'out': '', 'top': '', 'no_lock_in_run': '', 'no_lock_in_out': '', 'no_lock_in_top': '', 'prefix': '', 'bindir': None, 'libdir': None, 'progress_bar': 0, 'targets': '', 'files': '', 'destdir': '/home/peteck/dev/protobuf/protobuf_install', 'force': False, 'distcheck_args': None, 'no_resolve': False, 'skip_internal': False, 'standalone_archive': None, 'standalone_algo': 'zip', 'standalone_exclude': None, 'install_path': None, 'install_relative': None, 'install_shared_libs': None, 'install_static_libs': None, 'cxx_mkspec': None, 'cxx_debug': None, 'cxx_nodebug': None, 'cflags': None, 'cxxflags': None, 'linkflags': None, 'commonflags': None, 'android_sdk_dir': None, 'android_ndk_dir': None, 'ios_sdk_dir': None, 'ios_toolchain_dir': None, 'emscripten_path': None, 'poky_sdk_path': None, 'run_tests': None, 'run_silent': None, 'run_benchmarks': None, 'run_benchmark': None, 'print_benchmarks': None, 'print_benchmark_paths': None, 'run_cmd': None, 'result_file': None, 'result_folder': None, 'device_id': None, 'test_filter': None, 'ssh_runner': None, 'ssh_user': None, 'ssh_host': None, 'ssh_dest_dir': None, 'ssh_clean_dir': None, 'ssh_output_file': None, 'ssh_options': None, 'scp_options': None, 'with_protoc': True, 'resolve_path': None, 'git_protocol': None, 'symlinks_path': None, 'fast_resolve': None, 'lock_paths': None, 'lock_versions': None, 'waf_tools_path': None, 'waf_tools_checkout': None, 'protobuf_source_path': None, 'protobuf_source_checkout': None}
 out_dir = '/home/peteck/dev/protobuf/build/linux'
 run_dir = '/home/peteck/dev/protobuf'
 top_dir = '/home/peteck/dev/protobuf'

CMakeLists.txt

@@ -30,6 +30,10 @@ list(FILTER sw_protobuf_abseil_sources EXCLUDE REGEX .*absl\/.*\/.*testing.*)
 list(FILTER sw_protobuf_abseil_sources EXCLUDE REGEX .*absl\/.*\/.*benchmark.*)
 list(FILTER sw_protobuf_abseil_sources EXCLUDE REGEX .*absl\/.*\/.*mock.*)
 
+if(APPLE)
+  target_link_libraries(sw_protobuf_abseil_sources "-framework CoreFoundation")
+endif()
+
 add_library(sw_protobuf_abseil STATIC ${sw_protobuf_abseil_sources})
 target_include_directories(sw_protobuf_abseil PUBLIC ${STEINWURF_RESOLVE}/protobuf-source/third_party/abseil-cpp)
 
@@ -56,3 +60,9 @@ target_link_libraries(sw_protobuf PUBLIC sw_protobuf_abseil sw_protobuf_utf8_ran
 target_include_directories(sw_protobuf PUBLIC ${STEINWURF_RESOLVE}/protobuf-source/src)
 
 add_library(steinwurf::protobuf ALIAS sw_protobuf)
+
+# Is top level project?
+if(${CMAKE_PROJECT_NAME} STREQUAL ${PROJECT_NAME})
+  add_library(sw_protobuf_test STATIC test/cpp/src.pb.cc)
+  target_link_libraries(sw_protobuf_test PUBLIC sw_protobuf)
+endif()

test/cpp/.clang-format

@@ -0,0 +1,2 @@
+DisableFormat: true
+SortIncludes: false