github-starred/libxlsxwriter
2
0
Fork 0
mirror of https://github.com/jmcnamara/libxlsxwriter.git synced 2026-05-21 06:45:21 -06:00
Code Issues 16 Projects Packages Wiki Activity Actions

Separate test and example output dirs.

Browse source
This commit is contained in:
John McNamara 2022-02-15 12:56:18 +00:00
parent e5e9451831
commit 3b3945de84
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/cmake_actions.yml vendored
View file

@ -14,7 +14,7 @@ jobs:
matrix: matrix:
cc: [gcc, clang] cc: [gcc, clang]
cmake_flags: ["", cmake_flags: ["",
"-DBUILD_EXAMPLES=ON -DBUILD_TESTS=OFF", "-DBUILD_EXAMPLES=ON -DBUILD_TESTS=ON",
"-DUSE_DTOA_LIBRARY=ON -DBUILD_TESTS=ON", "-DUSE_DTOA_LIBRARY=ON -DBUILD_TESTS=ON",
"-DUSE_FMEMOPEN=ON -DBUILD_TESTS=ON", "-DUSE_FMEMOPEN=ON -DBUILD_TESTS=ON",
"-DUSE_NO_MD5=ON -DBUILD_TESTS=ON", "-DUSE_NO_MD5=ON -DBUILD_TESTS=ON",

2
.github/workflows/make_actions.yml vendored
View file

@ -1,4 +1,4 @@
name: Build with make name: Build with Make
on: on:
push: push:

2
.github/workflows/valgrind.yml vendored
View file

@ -25,4 +25,4 @@ jobs:
sudo apt-get -y install zlib1g-dev sudo apt-get -y install zlib1g-dev
- name: test valgrind - name: test valgrind
run: make test_valgrind V=1 run: make test_valgrind V=1 -j

14
CMakeLists.txt
View file

@ -259,11 +259,11 @@ if(NOT USE_OPENSSL_MD5 AND NOT USE_NO_MD5)
endif() endif()
if(USE_OPENSSL_MD5) if(USE_OPENSSL_MD5)
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
if(OpenSSL_FOUND) if(OpenSSL_FOUND)
include_directories(${OPENSSL_INCLUDE_DIR}) include_directories(${OPENSSL_INCLUDE_DIR})
message(STATUS "OpenSSL version: ${OPENSSL_VERSION}") message(STATUS "OpenSSL version: ${OPENSSL_VERSION}")
endif() endif()
endif() endif()
if (USE_DTOA_LIBRARY) if (USE_DTOA_LIBRARY)
@ -366,12 +366,11 @@ if(BUILD_TESTS)
message(" pip install pytest\n") message(" pip install pytest\n")
endif() endif()
set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/test/functional/src )
foreach(source ${LXW_FUNCTIONAL_SOURCES}) foreach(source ${LXW_FUNCTIONAL_SOURCES})
get_filename_component(basename ${source} NAME_WE) get_filename_component(basename ${source} NAME_WE)
add_executable(${basename} ${source}) add_executable(${basename} ${source})
target_link_libraries(${basename} xlsxwriter) target_link_libraries(${basename} xlsxwriter)
set_target_properties(${basename} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "test/functional/src")
endforeach(source) endforeach(source)
add_custom_command(TARGET xlsxwriter_unit POST_BUILD add_custom_command(TARGET xlsxwriter_unit POST_BUILD
@ -401,6 +400,7 @@ if(BUILD_EXAMPLES)
get_filename_component(basename ${source} NAME_WE) get_filename_component(basename ${source} NAME_WE)
add_executable(${basename} ${source}) add_executable(${basename} ${source})
target_link_libraries(${basename} ${PROJECT_NAME}) target_link_libraries(${basename} ${PROJECT_NAME})
set_target_properties(${basename} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "examples")
endforeach(source) endforeach(source)
endif() endif()