Skip to content

Commit

Permalink
xz_utils: fix test_package
Browse files Browse the repository at this point in the history
  • Loading branch information
SpaceIm committed Apr 9, 2020
1 parent 62426cc commit 6a540fc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
8 changes: 2 additions & 6 deletions recipes/xz_utils/all/test_package/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
project(test_package)
cmake_minimum_required(VERSION 2.8.11)

set(CMAKE_VERBOSE_MAKEFILE TRUE)
project(test_package)

include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
conan_basic_setup()

file(GLOB SOURCE_FILES *.c)

add_executable(${PROJECT_NAME} ${SOURCE_FILES})
add_executable(${PROJECT_NAME} main.c)
target_link_libraries(${PROJECT_NAME} ${CONAN_LIBS})
6 changes: 3 additions & 3 deletions recipes/xz_utils/all/test_package/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ def build(self):
cmake.build()

def test(self):
# Test the library
bin_path = os.path.join("bin", "test_package")
self.run(bin_path, run_environment=True)
if not tools.cross_building(self.settings):
bin_path = os.path.join("bin", "test_package")
self.run(bin_path, run_environment=True)

0 comments on commit 6a540fc

Please sign in to comment.