Commit 8ee4e65
committed
Download gtest fixes
1 parent c776127 commit 8ee4e65
2 files changed
Lines changed: 11 additions & 29 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -82,9 +82,16 @@ set(XTENSOR_PYTHON_CMAKECONFIG_INSTALL_DIR "share/cmake/${PROJECT_NAME}" CACHE S | |||
| 82 | 82 | configure_package_config_file(${PROJECT_NAME}Config.cmake.in | |
| 83 | 83 | "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" | |
| 84 | 84 | INSTALL_DESTINATION ${XTENSOR_PYTHON_CMAKECONFIG_INSTALL_DIR}) | |
| 85 | + | ||
| 86 | + # xtensor-python is header-only and does not depend on the architecture. | ||
| 87 | + # Remove CMAKE_SIZEOF_VOID_P from xtensor-pythonConfigVersion.cmake so that an xtensor-pythonConfig.cmake | ||
| 88 | + # generated for a 64 bit target can be used for 32 bit targets and vice versa. | ||
| 89 | + set(_XTENSOR_CMAKE_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P}) | ||
| 90 | + unset(CMAKE_SIZEOF_VOID_P) | ||
| 85 | 91 | write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake | |
| 86 | 92 | VERSION ${${PROJECT_NAME}_VERSION} | |
| 87 | 93 | COMPATIBILITY AnyNewerVersion) | |
| 94 | + set(CMAKE_SIZEOF_VOID_P ${_XTENSOR_CMAKE_SIZEOF_VOID_P}) | ||
| 88 | 95 | install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake | |
| 89 | 96 | ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake | |
| 90 | 97 | DESTINATION ${XTENSOR_PYTHON_CMAKECONFIG_INSTALL_DIR}) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -34,28 +34,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU" | |||
| 34 | 34 | else() | |
| 35 | 35 | message(FATAL_ERROR "Unsupported compiler -- xtensor requires C++14 support!") | |
| 36 | 36 | endif() | |
| 37 | - | ||
| 38 | - # Enable link time optimization and set the default symbol | ||
| 39 | - # visibility to hidden (very important to obtain small binaries) | ||
| 40 | - if (NOT ${U_CMAKE_BUILD_TYPE} MATCHES DEBUG) | ||
| 41 | - # Default symbol visibility | ||
| 42 | - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") | ||
| 43 | - | ||
| 44 | - # Check for Link Time Optimization support | ||
| 45 | - # (GCC/Clang) | ||
| 46 | - CHECK_CXX_COMPILER_FLAG("-flto" HAS_LTO_FLAG) | ||
| 47 | - if (HAS_LTO_FLAG) | ||
| 48 | - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto") | ||
| 49 | - endif() | ||
| 50 | - | ||
| 51 | - # Intel equivalent to LTO is called IPO | ||
| 52 | - if (CMAKE_CXX_COMPILER_ID MATCHES "Intel") | ||
| 53 | - CHECK_CXX_COMPILER_FLAG("-ipo" HAS_IPO_FLAG) | ||
| 54 | - if (HAS_IPO_FLAG) | ||
| 55 | - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ipo") | ||
| 56 | - endif() | ||
| 57 | - endif() | ||
| 58 | - endif() | ||
| 59 | 37 | endif() | |
| 60 | 38 | ||
| 61 | 39 | if(MSVC) | |
@@ -95,10 +73,7 @@ if (DOWNLOAD_GTEST OR GTEST_SRC_DIR) | |||
| 95 | 73 | ${CMAKE_CURRENT_BINARY_DIR}/googletest-build) | |
| 96 | 74 | ||
| 97 | 75 | set(GTEST_INCLUDE_DIRS "${gtest_SOURCE_DIR}/include") | |
| 98 | - set(GTEST_LIBRARY_DIRS "${gtest_BINARY_DIR}") | ||
| 99 | - set(GTEST_LIBRARIES "${GTEST_LIBRARY_DIRS}/gtest.lib") | ||
| 100 | - set(GTEST_MAIN_LIBRARIES "${GTEST_LIBRARY_DIRS}/gtest_main.lib") | ||
| 101 | - set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}) | ||
| 76 | + set(GTEST_BOTH_LIBRARIES gtest_main gtest) | ||
| 102 | 77 | else() | |
| 103 | 78 | find_package(GTest REQUIRED) | |
| 104 | 79 | endif() | |
@@ -121,8 +96,8 @@ add_executable(${XTENSOR_PYTHON_TARGET} ${XTENSOR_PYTHON_TESTS} ${XTENSOR_PYTHON | |||
| 121 | 96 | target_link_libraries(${XTENSOR_PYTHON_TARGET} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${PYTHON_LIBRARIES}) | |
| 122 | 97 | ||
| 123 | 98 | if(DOWNLOAD_GTEST OR GTEST_SRC_DIR) | |
| 124 | - add_custom_target(xtest COMMAND ./test_xtensor_python DEPENDS gtest_main ${XTENSOR_PYTHON_TARGET}) | ||
| 125 | - else() | ||
| 126 | - add_custom_target(xtest COMMAND ./test_xtensor_python DEPENDS ${XTENSOR_PYTHON_TARGET}) | ||
| 99 | + add_dependencies(${XTENSOR_TARGET} gtest_main) | ||
| 127 | 100 | endif() | |
| 128 | 101 | ||
| 102 | + add_custom_target(xtest COMMAND ./test_xtensor_python DEPENDS ${XTENSOR_PYTHON_TARGET}) | ||
| 103 | + | ||
0 commit comments