StarMirror/xlnt
1
0
Fork 0
mirror of https://github.com/tfussell/xlnt.git synced 2024-03-22 13:11:17 +08:00
Code Issues Projects Releases Wiki Activity

fix linking

Browse Source
This commit is contained in:
Thomas Fussell 2017-03-10 19:00:10 -05:00
parent 29ea2a4e99
commit e93e8ed091
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -26,14 +26,11 @@ if(BENCHMARKS)
endif() endif()
find_package(PythonInterp) find_package(PythonInterp)
find_package(CxxTest)
if(PYTHONINTERP_FOUND AND CXXTEST_FOUND) if(PYTHONINTERP_FOUND)
add_subdirectory(tests) add_subdirectory(tests)
elseif(NOT PYTHONINTERP_FOUND) elseif(NOT PYTHONINTERP_FOUND)
message("Python couldn't be found in the current PATH but is required for building tests. Tests will be skipped for now.") message("Python couldn't be found in the current PATH but is required for building tests. Tests will be skipped for now.")
else()
message("CxxTest couldn't be found in the current PATH but is required for building tests. Tests will be skipped for now.")
endif() endif()
add_subdirectory(source) add_subdirectory(source)

3
source/CMakeLists.txt
View File

@ -11,6 +11,9 @@ set(PROJECT_DESCRIPTION "cross-platform user-friendly xlsx library for C++14")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../third-party") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../third-party")
find_package(ZLIB REQUIRED)
find_package(CryptoPP REQUIRED)
if(APPLE) if(APPLE)
option(FRAMEWORK "Set to ON to package dylib and headers into a .framework, OSX only" OFF) option(FRAMEWORK "Set to ON to package dylib and headers into a .framework, OSX only" OFF)
endif() endif()

1
tests/CMakeLists.txt
View File

@ -71,7 +71,6 @@ else()
endif() endif()
find_package(PythonInterp REQUIRED) find_package(PythonInterp REQUIRED)
find_package(CxxTest REQUIRED)
add_custom_command(OUTPUT ${RUNNER} add_custom_command(OUTPUT ${RUNNER}
COMMAND ${CXXTEST_PYTHON_TESTGEN_EXECUTABLE} --runner=ErrorPrinter -o ${RUNNER} ${TESTS} COMMAND ${CXXTEST_PYTHON_TESTGEN_EXECUTABLE} --runner=ErrorPrinter -o ${RUNNER} ${TESTS}

2
third-party/CMakeLists.txt vendored
View File

@ -1,8 +1,6 @@
cmake_minimum_required(VERSION 3.2) cmake_minimum_required(VERSION 3.2)
project(xlnt.third-party) project(xlnt.third-party)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}")
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libstudxml) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libstudxml)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cxxtest) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cxxtest)