fix build failed

This commit is contained in:
zhangzifa
2019-01-10 15:07:18 +08:00
committed by Jackson Tian
parent 6e65f364a1
commit ad045aa702
3 changed files with 11 additions and 7 deletions

2
.gitignore vendored
View File

@@ -1 +1,3 @@
.vscode/ .vscode/
sdk_build/

View File

@@ -44,9 +44,10 @@ endif()
ExternalProject_Add(catch ExternalProject_Add(catch
URL ${CMAKE_CURRENT_SOURCE_DIR}/catch-2.0.1.hpp URL ${CMAKE_CURRENT_SOURCE_DIR}/catch-2.0.1.hpp
URL_HASH MD5=9b3d2cb5c0f9532cddfbbfd0a622f0af URL_HASH MD5=9b3d2cb5c0f9532cddfbbfd0a622f0af
DOWNLOAD_NO_EXTRACT 1 DOWNLOAD_COMMAND ""
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND "" BUILD_COMMAND ""
INSTALL_COMMAND INSTALL_COMMAND
${CMAKE_COMMAND} -E copy_if_different <DOWNLOADED_FILE> <INSTALL_DIR>/catch.hpp ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/catch-2.0.1.hpp <INSTALL_DIR>/catch.hpp
) )

View File

@@ -1,12 +1,12 @@
# #
# Copyright 2009-2017 Alibaba Cloud All rights reserved. # Copyright 2009-2017 Alibaba Cloud All rights reserved.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -48,7 +48,8 @@ add_subdirectory(core)
if(BUILD_TESTS) if(BUILD_TESTS)
enable_testing() enable_testing()
add_subdirectory(core-tests) add_subdirectory(test/core)
add_subdirectory(test/httpserver)
endif() endif()
add_subdirectory(ecs) add_subdirectory(ecs)
add_subdirectory(slb) add_subdirectory(slb)