diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2018-11-01 11:42:37 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2018-11-01 11:42:37 -0700 |
| commit | 2d44ad4badee8ad39f113de204c61269acd031ad (patch) | |
| tree | c935d295976a3c36a976e691721c356043134a16 /CMakeLists.txt | |
| parent | 3c742bfdc8f63e1cfed63a93571bb4e72e5f49c4 (diff) | |
Some fixes to the CMake build.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2909931..ba572fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,12 +91,12 @@ if(LUA_FOUND) set_target_properties(upb_c PROPERTIES - LIBRARY_OUTPUT_DIRECTORY "upb/bindings/lua" + LIBRARY_OUTPUT_DIRECTORY "lua" PREFIX "" SUFFIX ".so") set_target_properties(table_c pb_c PROPERTIES - LIBRARY_OUTPUT_DIRECTORY "upb/bindings/lua/upb" + LIBRARY_OUTPUT_DIRECTORY "lua/upb" PREFIX "" SUFFIX ".so") @@ -123,15 +123,16 @@ if(LUA_FOUND) DEPENDS ${CMAKE_SOURCE_DIR}/upb/bindings/lua/upb.lua COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/upb/bindings/lua/upb.lua - ${CMAKE_CURRENT_BINARY_DIR}/upb/bindings/lua) + ${CMAKE_CURRENT_BINARY_DIR}/lua) add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lua/upb/pb.lua + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lua/upb/table.lua + ${CMAKE_CURRENT_BINARY_DIR}/lua/upb/pb.lua DEPENDS ${CMAKE_SOURCE_DIR}/upb/bindings/lua/upb/table.lua ${CMAKE_SOURCE_DIR}/upb/bindings/lua/upb/pb.lua COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/upb/bindings/lua/upb/table.lua ${CMAKE_SOURCE_DIR}/upb/bindings/lua/upb/pb.lua - ${CMAKE_CURRENT_BINARY_DIR}/upb/bindings/lua/upb) + ${CMAKE_CURRENT_BINARY_DIR}/lua/upb) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/upb/pb/compile_decoder_x64.h @@ -144,6 +145,15 @@ if(LUA_FOUND) ) add_custom_target( + upbc ALL + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tools/make_c_api.lua + ${CMAKE_CURRENT_SOURCE_DIR}/tools/upbc.lua + ${CMAKE_CURRENT_BINARY_DIR}/tools/upbc + ${CMAKE_CURRENT_BINARY_DIR}/lua/upb.lua + ${CMAKE_CURRENT_BINARY_DIR}/lua/upb/pb.lua + ) + + add_custom_target( genfiles2 ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/upb/pb/compile_decoder_x64.h ) @@ -170,15 +180,6 @@ if(LUA_FOUND AND PROTOBUF_FOUND) set(protobuf_BUILD_CONFORMANCE ON CACHE BOOL "Build conformance tests" FORCE) add_subdirectory(third_party/protobuf/cmake) - add_custom_target( - upbc ALL - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tools/make_c_api.lua - ${CMAKE_CURRENT_SOURCE_DIR}/tools/upbc.lua - ${CMAKE_CURRENT_BINARY_DIR}/tools/upbc - ${CMAKE_CURRENT_BINARY_DIR}/lua/upb.lua - ${CMAKE_CURRENT_BINARY_DIR}/lua/upb/pb.lua - ) - add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/conformance.upb.h ${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/test_messages_proto3.upb.h |