diff --git a/CMakeLists.txt b/CMakeLists.txt index 84c9b45..7b2d852 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,17 +81,22 @@ set(LDFLAGS ${_ALLTARGETS_LIBRARIES} ) +if(NOT HAVE_GETOPT_C) + set(EXT_DEPS gperf_ext) +endif() +set(EXT_DEPS ${EXT_DEPS} portaudio_ext) + add_executable(run_assistant_text ${GOOGLEAPIS_CCS} ${CORE_SRCS} ${ASSISTANT_TEXT_SRCS}) target_link_libraries(run_assistant_text ${LDFLAGS}) -add_dependencies(run_assistant_text portaudio_ext) +add_dependencies(run_assistant_text ${EXT_DEPS}) add_executable(run_assistant_file ${GOOGLEAPIS_CCS} ${CORE_SRCS} ${AUDIO_INPUT_FILE_SRCS} ${ASSISTANT_FILE_SRCS}) target_link_libraries(run_assistant_file ${LDFLAGS}) -add_dependencies(run_assistant_file portaudio_ext) +add_dependencies(run_assistant_file ${EXT_DEPS}) add_executable(run_assistant_audio ${GOOGLEAPIS_CCS} ${CORE_SRCS} ${AUDIO_SRCS} ${ASSISTANT_AUDIO_SRCS}) target_link_libraries(run_assistant_audio ${LDFLAGS} ${_PORTAUDIO_LIB}) -add_dependencies(run_assistant_audio portaudio_ext) +add_dependencies(run_assistant_audio ${EXT_DEPS}) if(APPLE) target_link_libraries(run_assistant_text "-framework CoreFoundation") diff --git a/appveyor.yml b/appveyor.yml index ecc8ccb..073f264 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -98,6 +98,7 @@ build_script: -DBUILD_NUMBER=%APPVEYOR_BUILD_NUMBER% %CMAKE_ARGS% .. + - set CL=/MP - cmake --build . --config %CONFIGURATION% --target all after_build: diff --git a/cmake/build_dependencies.cmake b/cmake/build_dependencies.cmake index 0ed48e6..4494e02 100644 --- a/cmake/build_dependencies.cmake +++ b/cmake/build_dependencies.cmake @@ -189,6 +189,6 @@ link_directories( ${_SSL_LIBRARIES_DIRS} ) -set(Protobuf_PROTOC_EXECUTABLE ${CMAKE_STAGING_PREFIX}/bin/protoc) +set(Protobuf_PROTOC_EXECUTABLE ${CMAKE_STAGING_PREFIX}/bin/protoc${CMAKE_EXECUTABLE_SUFFIX}) set(PROTO_BASE_PATH ${CMAKE_CURRENT_BINARY_DIR}/grpc_ext-prefix/src/grpc_ext/third_party/googleapis) diff --git a/cmake/googleapis.cmake b/cmake/googleapis.cmake index 16f50bb..9edcaca 100644 --- a/cmake/googleapis.cmake +++ b/cmake/googleapis.cmake @@ -1,6 +1,6 @@ # Set grpc plugin if(NOT _gRPC_CPP_PLUGIN) - set(_gRPC_CPP_PLUGIN ${CMAKE_STAGING_PREFIX}/bin/grpc_cpp_plugin) + set(_gRPC_CPP_PLUGIN ${CMAKE_STAGING_PREFIX}/bin/grpc_cpp_plugin${CMAKE_EXECUTABLE_SUFFIX}) endif() if(NOT _gRPC_PROTO_GENS_DIR)