Explorar el Código

fix build failed

zhangzifa hace 7 años
padre
commit
ad045aa702
Se han modificado 3 ficheros con 11 adiciones y 7 borrados
  1. 2 0
      .gitignore
  2. 4 3
      3rdparty/CMakeLists.txt
  3. 5 4
      CMakeLists.txt

+ 2 - 0
.gitignore

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

+ 4 - 3
3rdparty/CMakeLists.txt

@@ -44,9 +44,10 @@ endif()
 ExternalProject_Add(catch
 	URL ${CMAKE_CURRENT_SOURCE_DIR}/catch-2.0.1.hpp
 	URL_HASH MD5=9b3d2cb5c0f9532cddfbbfd0a622f0af
-	DOWNLOAD_NO_EXTRACT 1
-	CONFIGURE_COMMAND ""
+	DOWNLOAD_COMMAND ""
+        CONFIGURE_COMMAND ""
 	BUILD_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
 	)

+ 5 - 4
CMakeLists.txt

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