organicmaps/gflags
13
Fork 0
mirror of https://github.com/gflags/gflags.git synced 2025-04-05 05:25:04 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Changes requested by review

Browse source
This commit is contained in:
Jai Moraes 2024-12-10 09:47:25 -05:00
parent 5371aecd26
commit 6c059177ca
2 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -435,14 +435,7 @@ else ()
endif ()
gflags_define (PATH LIBRARY_INSTALL_DIR "Directory of installed libraries, e.g., \"lib64\"" "lib${LIB_SUFFIX}")
gflags_property (LIBRARY_INSTALL_DIR ADVANCED TRUE)
# Cross-compiling for QNX does not install in the normal include path
if (QNX)
set (INCLUDE_INSTALL_DIR ${QNX_INCLUDE_INSTALL_DIR})
else()
set (INCLUDE_INSTALL_DIR include)
endif ()
set (INCLUDE_INSTALL_DIR include)
set (CONFIG_INSTALL_DIR ${LIBRARY_INSTALL_DIR}/cmake/${PACKAGE_NAME})
set (PKGCONFIG_INSTALL_DIR ${LIBRARY_INSTALL_DIR}/pkgconfig)
endif ()

30
test/CMakeLists.txt
View file

@ -169,20 +169,22 @@ add_test(NAME gflags_declare COMMAND gflags_declare_test --message "Hello gflags
set_tests_properties(gflags_declare PROPERTIES PASS_REGULAR_EXPRESSION "Hello gflags!")
# ----------------------------------------------------------------------------
# QNX Specific Installation (ctest not compatible)
if(QNX)
install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
DESTINATION ${RUNTIME_INSTALL_DIR}/gflags_tests)
install(DIRECTORY ${PROJECT_SOURCE_DIR}/test/
DESTINATION ${RUNTIME_INSTALL_DIR}/gflags_tests
FILES_MATCHING
PATTERN "flagfile.*"
PATTERN "gflags_unittest_flagfile"
PATTERN "config" EXCLUDE
PATTERN "nc" EXCLUDE
)
endif()
# qnx specific test installation (ctest not compatible)
if (QNX)
install (
DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
DESTINATION ${RUNTIME_INSTALL_DIR}/gflags_tests
)
install (
DIRECTORY ${PROJECT_SOURCE_DIR}/test/
DESTINATION ${RUNTIME_INSTALL_DIR}/gflags_tests
FILES_MATCHING
PATTERN "flagfile.*"
PATTERN "gflags_unittest_flagfile"
PATTERN "config" EXCLUDE
PATTERN "nc" EXCLUDE
)
endif ()
# ----------------------------------------------------------------------------
# configure Python script which configures and builds a test project