From 2d44ad4badee8ad39f113de204c61269acd031ad Mon Sep 17 00:00:00 2001
From: Josh Haberman <jhaberman@gmail.com>
Date: Thu, 1 Nov 2018 11:42:37 -0700
Subject: Some fixes to the CMake build.

---
 CMakeLists.txt | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'CMakeLists.txt')

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
@@ -143,6 +144,15 @@ if(LUA_FOUND)
         > ${CMAKE_CURRENT_BINARY_DIR}/upb/pb/compile_decoder_x64.h
   )
 
+  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
-- 
cgit v1.2.3