修复测试功能
This commit is contained in:
@@ -17,7 +17,8 @@ else()
|
|||||||
add_library(${PROJECT_NAME} ${SRC})
|
add_library(${PROJECT_NAME} ${SRC})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if (SKIPTEST)
|
||||||
|
else()
|
||||||
add_executable(test_main ${CMAKE_SOURCE_DIR}/test_package/main.c ${SRC})
|
add_executable(test_main ${CMAKE_SOURCE_DIR}/test_package/main.c ${SRC})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ class loggingRecipe(ConanFile):
|
|||||||
deps = CMakeDeps(self)
|
deps = CMakeDeps(self)
|
||||||
deps.generate()
|
deps.generate()
|
||||||
tc = CMakeToolchain(self)
|
tc = CMakeToolchain(self)
|
||||||
|
tc.variables["SKIPTEST"]=True
|
||||||
if self.options.shared:
|
if self.options.shared:
|
||||||
tc.variables["SHARED"] = True
|
tc.variables["SHARED"] = True
|
||||||
else:
|
else:
|
||||||
@@ -51,6 +52,7 @@ class loggingRecipe(ConanFile):
|
|||||||
cmake.configure()
|
cmake.configure()
|
||||||
cmake.build(target="Logging")
|
cmake.build(target="Logging")
|
||||||
|
|
||||||
|
|
||||||
def package(self):
|
def package(self):
|
||||||
copy(self, "LICENSE", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
|
copy(self, "LICENSE", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
|
||||||
copy(self, pattern="*.h", src=os.path.join(self.source_folder, "include"), dst=os.path.join(self.package_folder, "include"))
|
copy(self, pattern="*.h", src=os.path.join(self.source_folder, "include"), dst=os.path.join(self.package_folder, "include"))
|
||||||
|
|||||||
Reference in New Issue
Block a user