From 7e51c9713b9a63a49d45f8602e98e0114e22ee96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Mayer?= Date: Wed, 24 Apr 2013 12:57:56 +0000 Subject: [PATCH] dumpabi: This would create the directories in the sourcedir instead of the binary dir. Fixed that. NOTE: It fails with and without this patch for out of tree builds: jmayer@egg:~/work/wireshark/svn/build/qt-gtk3> make dumpabi [ 1%] Built target wsutil [ 1%] Generating libwsutil.abi.tar.gz ERROR: can't find modules cp: cannot stat `abi_dumps/libwsutil/libwsutil_*': No such file or directory make[3]: *** [wsutil/libwsutil.abi.tar.gz] Error 1 make[2]: *** [wsutil/CMakeFiles/dumpabi-libwsutil.dir/all] Error 2 make[1]: *** [CMakeFiles/dumpabi.dir/rule] Error 2 make: *** [dumpabi] Error 2 jmayer@egg:~/work/wireshark/svn/build/qt-gtk3> svn path=/trunk/; revision=49014 --- epan/CMakeLists.txt | 12 +++++++----- wiretap/CMakeLists.txt | 2 +- wsutil/CMakeLists.txt | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 201f005a45..768c5614b9 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1573,11 +1573,13 @@ file(GLOB DFILTER_HEADERS dfilter/*.h ../tools/lemon/cppmagic.h) file(GLOB D_HEADERS dissectors/*.h) file(GLOB FTYPES_HEADERS ftypes/*.h) file(GLOB WMEM_HEADERS wmem/*.h) -file(MAKE_DIRECTORY abi-check-headers abi-check-headers/epan - abi-check-headers/crypt abi-check-headers/dfilter - abi-check-headers/dissectors abi-check-headers/ftypes - abi-check-headers/wmem) -file(MAKE_DIRECTORY abi-check-headers/epan) +file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/abi-check-headers + ${CMAKE_CURRENT_BINARY_DIR}/abi-check-headers/epan + ${CMAKE_CURRENT_BINARY_DIR}/abi-check-headers/crypt + ${CMAKE_CURRENT_BINARY_DIR}/abi-check-headers/dfilter + ${CMAKE_CURRENT_BINARY_DIR}/abi-check-headers/dissectors + ${CMAKE_CURRENT_BINARY_DIR}/abi-check-headers/ftypes + ${CMAKE_CURRENT_BINARY_DIR}/abi-check-headers/wmem) file(COPY ../color.h ../register.h ../ws_symbol_export.h DESTINATION abi-check-headers) file(COPY ${EPAN_HEADERS} DESTINATION abi-check-headers/epan) diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt index 5435482f9b..1ddbcfdbf1 100644 --- a/wiretap/CMakeLists.txt +++ b/wiretap/CMakeLists.txt @@ -125,7 +125,7 @@ configure_file(../abi-descriptor.template abi-descriptor.xml) # http://ispras.linux-foundation.org/index.php/ABI_compliance_checker # Checked using version 1.21.12 file(GLOB HEADERS *.h) -file(MAKE_DIRECTORY abi-check-headers) +file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/abi-check-headers) file(COPY ${HEADERS} ../ws_symbol_export.h DESTINATION abi-check-headers) diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index df689bff48..94a2183082 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -78,7 +78,7 @@ configure_file(../abi-descriptor.template abi-descriptor.xml) # http://ispras.linux-foundation.org/index.php/ABI_compliance_checker # Checked using version 1.21.12 file(GLOB HEADERS *.h) -file(MAKE_DIRECTORY abi-check-headers) +file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/abi-check-headers) file(COPY ${HEADERS} ../ws_symbol_export.h DESTINATION abi-check-headers)