aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-08-15 17:05:17 -0700
committerGerald Combs <gerald@wireshark.org>2015-08-16 16:04:47 +0000
commitc643cbfb8184a9d2faa888e7210185dab265c5c9 (patch)
tree507e77efd5ecee9352f5a4736cbabbc8fd6f14bb /cmake
parent8d1a5498fb4c461aff048265178f1edc0d49f250 (diff)
Run abicheck commands at compile time.
The CMake dumpbabi targets collectively copy over 800 files. Do that when when we build the actual targets instead of at configure time. Hopefully this will speed up initial CMake runs. Change-Id: I6e4d691e24c73ea05d638a0f897f570541c84e38 Reviewed-on: https://code.wireshark.org/review/10052 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/modules/UseABICheck.cmake12
1 files changed, 9 insertions, 3 deletions
diff --git a/cmake/modules/UseABICheck.cmake b/cmake/modules/UseABICheck.cmake
index 9ed39da0ee..024921b453 100644
--- a/cmake/modules/UseABICheck.cmake
+++ b/cmake/modules/UseABICheck.cmake
@@ -16,9 +16,15 @@ MACRO(ABICHECK _libname)
configure_file(../abi-descriptor.template abi-descriptor.xml)
# discover and substitute list of include directories for ABI compatibility
# checks
- file(GLOB HEADERS *.h)
- file(MAKE_DIRECTORY ${ABICHECK_TMPDIR})
- file(COPY ${HEADERS} ${CMAKE_SOURCE_DIR}/ws_symbol_export.h DESTINATION ${ABICHECK_TMPDIR})
+ file(GLOB ABICHECK_HEADERS RELATIVE ${CMAKE_CURRENT_BINARY_DIR} *.h)
+ set(ABICHECK_HEADERS ${ABICHECK_HEADERS} ${CMAKE_SOURCE_DIR}/ws_symbol_export.h)
add_custom_target(dumpabi-${_libname} DEPENDS ${_libname}.abi.tar.gz)
set_target_properties(dumpabi-${_libname} PROPERTIES FOLDER "Auxilary")
+ if (WIN32)
+ set(ABI_COPY_COMMAND xcopy)
+ set(ABI_COPY_FLAGS /d)
+ else()
+ set(ABI_COPY_COMMAND cp)
+ set(ABI_COPY_FLAGS)
+ endif()
ENDMACRO()