Add the missing lua_sax dependency on the luasandbox lib

- Fixes the OSX build with cmake 3.5+
mozilla-services · May 9, 2016 · 9733186 · 9733186
1 parent 7abcb7c
commit 9733186
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cmake/externals.cmake b/cmake/externals.cmake
@@ -119,6 +119,7 @@ externalproject_add(
     CMAKE_ARGS ${SANDBOX_CMAKE_ARGS}
     INSTALL_ARGS ${INST_ARGS}
 )
+add_dependencies(lua_bloom_filter luasandbox)
 
 externalproject_add(
     lua_circular_buffer
@@ -127,6 +128,7 @@ externalproject_add(
     CMAKE_ARGS ${SANDBOX_CMAKE_ARGS}
     INSTALL_ARGS ${INST_ARGS}
 )
+add_dependencies(lua_circular_buffer luasandbox)
 
 externalproject_add(
     lua_hyperloglog
@@ -135,6 +137,7 @@ externalproject_add(
     CMAKE_ARGS ${SANDBOX_CMAKE_ARGS}
     INSTALL_ARGS ${INST_ARGS}
 )
+add_dependencies(lua_hyperloglog luasandbox)
 
 externalproject_add(
     lua_cuckoo_filter
@@ -143,6 +146,7 @@ externalproject_add(
     CMAKE_ARGS ${SANDBOX_CMAKE_ARGS}
     INSTALL_ARGS ${INST_ARGS}
 )
+add_dependencies(lua_cuckoo_filter luasandbox)
 
 externalproject_add(
     lua_sax
@@ -151,3 +155,4 @@ externalproject_add(
     CMAKE_ARGS ${SANDBOX_CMAKE_ARGS}
     INSTALL_ARGS ${INST_ARGS}
 )
+add_dependencies(lua_sax luasandbox)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -16,10 +16,6 @@ set ( CMAKE_BUILD_WITH_INSTALL_RPATH FALSE CACHE STRING "" FORCE )
 add_library(luasandbox SHARED ${LUA_SANDBOX_SRC})
 
 add_dependencies(luasandbox ${LUA_PROJECT})
-add_dependencies(lua_bloom_filter luasandbox)
-add_dependencies(lua_circular_buffer luasandbox)
-add_dependencies(lua_hyperloglog luasandbox)
-add_dependencies(lua_cuckoo_filter luasandbox)
 
 if(MSVC)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)