Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2018-07-21 10:10:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Sat Jul 21 10:10:16 2018 rev:55 rq:623254 version:5.48.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2018-06-22 13:18:41.579674125 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes
2018-07-21 10:11:18.547155510 +0200
@@ -1,0 +2,15 @@
+Mon Jul 16 04:37:34 UTC 2018 - [email protected]
+
+- Update to 5.48.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.48.0.php
+- Changes since 5.47.0:
+ * Android: Make it possible to override a target's APK directory
+ * Drop outdated QT_USE_FAST_OPERATOR_PLUS
+ * Add -Wlogical-op -Wzero-as-null-pointer-constant to KF5 warnings
+ * [ECMGenerateHeaders] Add option for other header file extension than .h
+ * Don't include a 64 when building 64bit architectures on flatpak
+ * skip automoc here
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.47.0.tar.xz
New:
----
extra-cmake-modules-5.48.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.EbeUal/_old 2018-07-21 10:11:19.751155231 +0200
+++ /var/tmp/diff_new_pack.EbeUal/_new 2018-07-21 10:11:19.751155231 +0200
@@ -16,18 +16,18 @@
#
-%define _tar_path 5.47
+%define _tar_path 5.48
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
-%{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} |
awk -F. '{print $1"."$2}')}
+%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} |
awk -F. '{print $1"."$2}')}
%if 0%{?suse_version} >= 1330
%bcond_without doc
%else
%bcond_with doc
%endif
Name: extra-cmake-modules
-Version: 5.47.0
+Version: 5.48.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-5.47.0.tar.xz -> extra-cmake-modules-5.48.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.47.0/CMakeLists.txt
new/extra-cmake-modules-5.48.0/CMakeLists.txt
--- old/extra-cmake-modules-5.47.0/CMakeLists.txt 2018-05-31
10:10:15.000000000 +0200
+++ new/extra-cmake-modules-5.48.0/CMakeLists.txt 2018-07-04
17:04:12.000000000 +0200
@@ -32,7 +32,7 @@
# Preliminary setup
#
-set(VERSION "5.47.0") # handled by release scripts
+set(VERSION "5.48.0") # handled by release scripts
if (POLICY CMP0048)
cmake_policy(SET CMP0048 NEW)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.47.0/find-modules/FindWaylandScanner.cmake
new/extra-cmake-modules-5.48.0/find-modules/FindWaylandScanner.cmake
--- old/extra-cmake-modules-5.47.0/find-modules/FindWaylandScanner.cmake
2018-05-31 10:10:15.000000000 +0200
+++ new/extra-cmake-modules-5.48.0/find-modules/FindWaylandScanner.cmake
2018-07-04 17:04:12.000000000 +0200
@@ -125,6 +125,7 @@
set_source_files_properties(${_client_header} GENERATED)
set_source_files_properties(${_code} GENERATED)
+ set_property(SOURCE ${_client_header} PROPERTY SKIP_AUTOMOC ON)
add_custom_command(OUTPUT "${_client_header}"
COMMAND ${WaylandScanner_EXECUTABLE} client-header < ${_infile} >
${_client_header}
@@ -154,7 +155,7 @@
get_filename_component(_infile ${ARGS_PROTOCOL} ABSOLUTE)
set(_server_header
"${CMAKE_CURRENT_BINARY_DIR}/wayland-${ARGS_BASENAME}-server-protocol.h")
-
+ set_property(SOURCE ${_server_header} PROPERTY SKIP_AUTOMOC ON)
set_source_files_properties(${_server_header} GENERATED)
add_custom_command(OUTPUT "${_server_header}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.47.0/kde-modules/KDEFrameworkCompilerSettings.cmake
new/extra-cmake-modules-5.48.0/kde-modules/KDEFrameworkCompilerSettings.cmake
---
old/extra-cmake-modules-5.47.0/kde-modules/KDEFrameworkCompilerSettings.cmake
2018-05-31 10:10:15.000000000 +0200
+++
new/extra-cmake-modules-5.48.0/kde-modules/KDEFrameworkCompilerSettings.cmake
2018-07-04 17:04:12.000000000 +0200
@@ -53,7 +53,6 @@
-DQT_NO_URL_CAST_FROM_STRING
-DQT_NO_CAST_FROM_BYTEARRAY
-DQT_NO_SIGNALS_SLOTS_KEYWORDS
- -DQT_USE_FAST_OPERATOR_PLUS
-DQT_USE_QSTRINGBUILDER
)
@@ -67,6 +66,12 @@
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override" )
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override -Wlogical-op
-Wzero-as-null-pointer-constant" )
+ endif()
+endif()
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wzero-as-null-pointer-constant"
)
endif()
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.47.0/kde-modules/KDEInstallDirs.cmake
new/extra-cmake-modules-5.48.0/kde-modules/KDEInstallDirs.cmake
--- old/extra-cmake-modules-5.47.0/kde-modules/KDEInstallDirs.cmake
2018-05-31 10:10:15.000000000 +0200
+++ new/extra-cmake-modules-5.48.0/kde-modules/KDEInstallDirs.cmake
2018-07-04 17:04:12.000000000 +0200
@@ -235,13 +235,15 @@
# Override this default 'lib' with 'lib64' iff:
# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
# - we are NOT on debian
+# - we are NOT on flatpak
# - we are on a 64 bits system
# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
# See http://wiki.debian.org/Multiarch
if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL
"GNU")
- AND NOT CMAKE_CROSSCOMPILING)
+ AND NOT CMAKE_CROSSCOMPILING
+ AND NOT DEFINED ENV{FLATPAK_ID})
if (EXISTS "/etc/debian_version") # is this a debian system ?
if(CMAKE_LIBRARY_ARCHITECTURE)
set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.47.0/modules/ECMGenerateHeaders.cmake
new/extra-cmake-modules-5.48.0/modules/ECMGenerateHeaders.cmake
--- old/extra-cmake-modules-5.47.0/modules/ECMGenerateHeaders.cmake
2018-05-31 10:10:15.000000000 +0200
+++ new/extra-cmake-modules-5.48.0/modules/ECMGenerateHeaders.cmake
2018-07-04 17:04:12.000000000 +0200
@@ -9,6 +9,7 @@
# ecm_generate_headers(<camelcase_forwarding_headers_var>
# HEADER_NAMES <CamelCaseName> [<CamelCaseName> [...]]
# [ORIGINAL <CAMELCASE|LOWERCASE>]
+# [HEADER_EXTENSION <header_extension>]
# [OUTPUT_DIR <output_dir>]
# [PREFIX <prefix>]
# [REQUIRED_HEADERS <variable>]
@@ -16,7 +17,8 @@
# [RELATIVE <relative_path>])
#
# For each CamelCase header name passed to HEADER_NAMES, a file of that name
-# will be generated that will include a version with ``.h`` appended.
+# will be generated that will include a version with ``.h`` or, if set,
+# ``.<header_extension>`` appended.
# For example, the generated header ``ClassA`` will include ``classa.h`` (or
# ``ClassA.h``, see ORIGINAL).
# If a CamelCaseName consists of multiple comma-separated files, e.g.
@@ -28,6 +30,9 @@
# ORIGINAL specifies how the name of the original header is written: lowercased
# or also camelcased. The default is LOWERCASE. Since 1.8.0.
#
+# HEADER_EXTENSION specifies what file name extension is used for the header
+# files. The default is "h". Since 5.48.0.
+#
# PREFIX places the generated headers in subdirectories. This should be a
# CamelCase name like ``KParts``, which will cause the CamelCase forwarding
# headers to be placed in the ``KParts`` directory (e.g. ``KParts/Part``). It
@@ -138,7 +143,7 @@
function(ECM_GENERATE_HEADERS camelcase_forwarding_headers_var)
set(options)
- set(oneValueArgs ORIGINAL OUTPUT_DIR PREFIX REQUIRED_HEADERS COMMON_HEADER
RELATIVE)
+ set(oneValueArgs ORIGINAL HEADER_EXTENSION OUTPUT_DIR PREFIX
REQUIRED_HEADERS COMMON_HEADER RELATIVE)
set(multiValueArgs HEADER_NAMES)
cmake_parse_arguments(EGH "${options}" "${oneValueArgs}"
"${multiValueArgs}" ${ARGN})
@@ -158,6 +163,10 @@
message(FATAL_ERROR "Unexpected value for original argument to
ECM_GENERATE_HEADERS: ${EGH_ORIGINAL}")
endif()
+ if(NOT EGH_HEADER_EXTENSION)
+ set(EGH_HEADER_EXTENSION "h")
+ endif()
+
if(NOT EGH_OUTPUT_DIR)
set(EGH_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
endif()
@@ -188,7 +197,7 @@
string(TOLOWER "${_baseclass}" originalbasename)
endif()
- set(_actualheader
"${CMAKE_CURRENT_SOURCE_DIR}/${EGH_RELATIVE}${originalbasename}.h")
+ set(_actualheader
"${CMAKE_CURRENT_SOURCE_DIR}/${EGH_RELATIVE}${originalbasename}.${EGH_HEADER_EXTENSION}")
if (NOT EXISTS ${_actualheader})
message(FATAL_ERROR "Could not find \"${_actualheader}\"")
endif()
@@ -196,7 +205,7 @@
foreach(_CLASSNAME ${_classnames})
set(FANCY_HEADER_FILE
"${EGH_OUTPUT_DIR}/${EGH_PREFIX}${_CLASSNAME}")
if (NOT EXISTS ${FANCY_HEADER_FILE})
- file(WRITE ${FANCY_HEADER_FILE} "#include
\"${originalprefix}${originalbasename}.h\"\n")
+ file(WRITE ${FANCY_HEADER_FILE} "#include
\"${originalprefix}${originalbasename}.${EGH_HEADER_EXTENSION}\"\n")
endif()
list(APPEND ${camelcase_forwarding_headers_var}
"${FANCY_HEADER_FILE}")
if (EGH_PREFIX)
@@ -206,7 +215,7 @@
else()
string(TOLOWER "${_CLASSNAME}" originalclassname)
endif()
- set(REGULAR_HEADER_NAME
${EGH_OUTPUT_DIR}/${originalprefix}${originalclassname}.h)
+ set(REGULAR_HEADER_NAME
${EGH_OUTPUT_DIR}/${originalprefix}${originalclassname}.${EGH_HEADER_EXTENSION})
if (NOT EXISTS ${REGULAR_HEADER_NAME})
file(WRITE ${REGULAR_HEADER_NAME} "#include
\"${_actualheader}\"\n")
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.47.0/tests/ECMGenerateHeadersTest/run_test.cmake.config
new/extra-cmake-modules-5.48.0/tests/ECMGenerateHeadersTest/run_test.cmake.config
---
old/extra-cmake-modules-5.47.0/tests/ECMGenerateHeadersTest/run_test.cmake.config
2018-05-31 10:10:15.000000000 +0200
+++
new/extra-cmake-modules-5.48.0/tests/ECMGenerateHeadersTest/run_test.cmake.config
2018-07-04 17:04:12.000000000 +0200
@@ -354,4 +354,24 @@
endif()
+###########################################################
+
+message(STATUS "Test 14: HEADER_EXTENSION")
+set(camelcase_headers)
+set(expfiles "${CMAKE_CURRENT_BINARY_DIR}/HeadTest1"
+ "${CMAKE_CURRENT_BINARY_DIR}/HeadTest2")
+set(origfiles headtest1.hpp headtest2.hpp)
+file(REMOVE ${expfiles})
+ecm_generate_headers(
+ camelcase_headers
+ HEADER_NAMES HeadTest1 HeadTest2
+ HEADER_EXTENSION hpp
+)
+if (NOT "${expfiles}" STREQUAL "${camelcase_headers}")
+ message(FATAL_ERROR "camelcase_headers was set to \"${camelcase_headers}\"
instead of \"${expfiles}\"")
+endif()
+check_files(GENERATED ${expfiles}
+ ORIGINALS ${origfiles})
+
+
# vim:ft=cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.47.0/toolchain/Android.cmake
new/extra-cmake-modules-5.48.0/toolchain/Android.cmake
--- old/extra-cmake-modules-5.47.0/toolchain/Android.cmake 2018-05-31
10:10:15.000000000 +0200
+++ new/extra-cmake-modules-5.48.0/toolchain/Android.cmake 2018-07-04
17:04:12.000000000 +0200
@@ -108,6 +108,10 @@
#
# make create-apk-myapp ARGS="--sign ~/my.keystore alias_name"
#
+# In case it's needed for your application to set the APK directory from cmake
+# scripting you can also set the directory as the ANDROID_APK_DIR property of
+# the create-apk-myapp target.
+#
# See Android documentation on how to create a keystore to use
# =============================================================================
@@ -198,8 +202,13 @@
list(GET ANDROID_APK_DIR ${idx} APK_DIR)
if(APK_DIR AND NOT EXISTS "${APK_DIR}/AndroidManifest.xml")
message(FATAL_ERROR "Cannot find ${APK_DIR}/AndroidManifest.xml
according to ANDROID_APK_DIR. ${ANDROID_APK_DIR} ${exportedTarget}")
+ elseif(NOT APK_DIR)
+ get_filename_component(_qt5Core_install_prefix
"${Qt5Core_DIR}/../../../" ABSOLUTE)
+ set(ANDROID_APK_DIR
"${_qt5Core_install_prefix}/src/android/templates/")
endif()
- ecm_androiddeployqt("${exportedTarget}"
"${ECM_ADDITIONAL_FIND_ROOT_PATH}" "${APK_DIR}")
+
+ ecm_androiddeployqt("${exportedTarget}"
"${ECM_ADDITIONAL_FIND_ROOT_PATH}")
+ set_target_properties(create-apk-${exportedTarget} PROPERTIES
ANDROID_APK_DIR "${APK_DIR}")
endforeach()
else()
message(STATUS "You can export a target by specifying
-DQTANDROID_EXPORTED_TARGET=<targetname> and -DANDROID_APK_DIR=<paths>")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.47.0/toolchain/ECMAndroidDeployQt.cmake
new/extra-cmake-modules-5.48.0/toolchain/ECMAndroidDeployQt.cmake
--- old/extra-cmake-modules-5.47.0/toolchain/ECMAndroidDeployQt.cmake
2018-05-31 10:10:15.000000000 +0200
+++ new/extra-cmake-modules-5.48.0/toolchain/ECMAndroidDeployQt.cmake
2018-07-04 17:04:12.000000000 +0200
@@ -1,11 +1,6 @@
find_package(Qt5Core REQUIRED)
-function(ecm_androiddeployqt QTANDROID_EXPORTED_TARGET
ECM_ADDITIONAL_FIND_ROOT_PATH ANDROID_APK_DIR)
- get_filename_component(_qt5Core_install_prefix "${Qt5Core_DIR}/../../../"
ABSOLUTE)
- if(NOT ANDROID_APK_DIR)
- set(ANDROID_APK_DIR
"${_qt5Core_install_prefix}/src/android/templates/")
- endif()
-
+function(ecm_androiddeployqt QTANDROID_EXPORTED_TARGET
ECM_ADDITIONAL_FIND_ROOT_PATH)
set(EXPORT_DIR
"${CMAKE_BINARY_DIR}/${QTANDROID_EXPORTED_TARGET}_build_apk/")
set(EXECUTABLE_DESTINATION_PATH
"${EXPORT_DIR}/libs/${CMAKE_ANDROID_ARCH_ABI}/lib${QTANDROID_EXPORTED_TARGET}.so")
set(QML_IMPORT_PATHS "")
@@ -33,7 +28,9 @@
endif()
endforeach()
string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" _LOWER_CMAKE_HOST_SYSTEM_NAME)
- configure_file("${_CMAKE_ANDROID_DIR}/deployment-file.json.in"
"${QTANDROID_EXPORTED_TARGET}-deployment.json.in")
+ configure_file("${_CMAKE_ANDROID_DIR}/deployment-file.json.in"
"${CMAKE_BINARY_DIR}/${QTANDROID_EXPORTED_TARGET}-deployment.json.in1")
+ file(GENERATE OUTPUT
"${CMAKE_BINARY_DIR}/${QTANDROID_EXPORTED_TARGET}-deployment.json.in2"
+ INPUT
"${CMAKE_BINARY_DIR}/${QTANDROID_EXPORTED_TARGET}-deployment.json.in1")
if (CMAKE_GENERATOR STREQUAL "Unix Makefiles")
set(arguments "\\$(ARGS)")
@@ -54,10 +51,10 @@
add_custom_target(${CREATEAPK_TARGET_NAME}
COMMAND cmake -E echo "Generating
$<TARGET_NAME:${QTANDROID_EXPORTED_TARGET}> with
$<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt"
COMMAND cmake -E remove_directory "${EXPORT_DIR}"
- COMMAND cmake -E copy_directory "${ANDROID_APK_DIR}" "${EXPORT_DIR}"
+ COMMAND cmake -E copy_directory
"$<TARGET_PROPERTY:create-apk-${QTANDROID_EXPORTED_TARGET},ANDROID_APK_DIR>"
"${EXPORT_DIR}"
COMMAND cmake -E copy "$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>"
"${EXECUTABLE_DESTINATION_PATH}"
COMMAND LANG=C cmake
"-DTARGET=$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>" -P
${_CMAKE_ANDROID_DIR}/hasMainSymbol.cmake
- COMMAND LANG=C cmake
-DINPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json.in"
-DOUTPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json"
"-DTARGET=$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>"
"-DOUTPUT_DIR=$<TARGET_FILE_DIR:${QTANDROID_EXPORTED_TARGET}>"
"-DEXPORT_DIR=${CMAKE_INSTALL_PREFIX}"
"-DECM_ADDITIONAL_FIND_ROOT_PATH=\"${ECM_ADDITIONAL_FIND_ROOT_PATH}\""
"-DANDROID_EXTRA_LIBS=\"${ANDROID_EXTRA_LIBS}\"" -P
${_CMAKE_ANDROID_DIR}/specifydependencies.cmake
+ COMMAND LANG=C cmake
-DINPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json.in2"
-DOUTPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json"
"-DTARGET=$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>"
"-DOUTPUT_DIR=$<TARGET_FILE_DIR:${QTANDROID_EXPORTED_TARGET}>"
"-DEXPORT_DIR=${CMAKE_INSTALL_PREFIX}"
"-DECM_ADDITIONAL_FIND_ROOT_PATH=\"${ECM_ADDITIONAL_FIND_ROOT_PATH}\""
"-DANDROID_EXTRA_LIBS=\"${ANDROID_EXTRA_LIBS}\"" -P
${_CMAKE_ANDROID_DIR}/specifydependencies.cmake
COMMAND $<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt --gradle --input
"${QTANDROID_EXPORTED_TARGET}-deployment.json" --output "${EXPORT_DIR}"
--deployment bundled ${arguments}
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.47.0/toolchain/deployment-file.json.in
new/extra-cmake-modules-5.48.0/toolchain/deployment-file.json.in
--- old/extra-cmake-modules-5.47.0/toolchain/deployment-file.json.in
2018-05-31 10:10:15.000000000 +0200
+++ new/extra-cmake-modules-5.48.0/toolchain/deployment-file.json.in
2018-07-04 17:04:12.000000000 +0200
@@ -12,7 +12,7 @@
@DEFINE_QML_IMPORT_PATHS@
##EXTRALIBS##
##EXTRAPLUGINS##
- "android-package-source-directory": "@ANDROID_APK_DIR@",
+ "android-package-source-directory":
"$<TARGET_PROPERTY:create-apk-${QTANDROID_EXPORTED_TARGET},ANDROID_APK_DIR>",
"stdcpp-path":##CMAKE_CXX_STANDARD_LIBRARIES##,
"sdkBuildToolsRevision": "@ANDROID_SDK_BUILD_TOOLS_REVISION@",
"extraPrefixDirs": [ @EXTRA_PREFIX_DIRS@ ]
