add explicit dependency to gen_onnx_proto

pfnet-research · Oct 2, 2018 · 8770abd · 8770abd
1 parent 6a7413e
commit 8770abd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -72,7 +72,7 @@ build_script:
     cmake -G "MSYS Makefiles" -DENABLE_TEST=ON %STATIC_OPTION% -DCMAKE_INSTALL_PREFIX=/mingw64 .. &&
     make
   ) else (
-    cmake -G "Visual Studio 14 Win64" -DENABLE_TEST=OFF -DENABLE_BENCHMARK=OFF -DENABLE_EXAMPLE=OFF -DENABLE_TOOL=OFF -DCMAKE_INSTALL_PREFIX=c:\menoh-%MENOH_REV%-msvc .. &&
+    cmake -G "Visual Studio 14 Win64" -DENABLE_TEST=OFF -DENABLE_BENCHMARK=OFF -DENABLE_EXAMPLE=OFF -DCMAKE_INSTALL_PREFIX=c:\menoh-%MENOH_REV%-msvc .. &&
     cmake --build . --config Release --target install
   )
 

diff --git a/menoh/CMakeLists.txt b/menoh/CMakeLists.txt
@@ -11,6 +11,8 @@ file(GLOB_RECURSE SOURCES "." "*.cpp")
 
 # Create a object library for generating shared library
 add_library(menoh_objlib OBJECT ${SOURCES})
+add_dependencies(menoh_objlib gen_onnx_proto) # custom target defined in onnx
+
 set_target_properties(menoh_objlib PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 include(ConfigureMenoh)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -3,7 +3,7 @@ enable_testing()
 # GTest setup
 set(GTEST_DIR "lib/googletest")
 execute_process(COMMAND git submodule update --init -- test/${GTEST_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-message(STATUS "Adding_${GTEST_DIR}")
+message(STATUS "Adding ${GTEST_DIR}")
 add_subdirectory(${GTEST_DIR})
 
 # filesystem setup