Use the lxqt-build-tools/lxqt_create_portable_headers

Drop the local version.
lxqt · Oct 14, 2016 · 4d5c839 · 4d5c839
1 parent e902734
commit 4d5c839
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 38 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,6 +27,7 @@ find_package(lxqt REQUIRED QUIET)
 
 include(LXQtTranslate)
 include(LXQtCreatePkgConfigFile)
+include(LXQtCreatePortableHeaders)
 include(LXQtCompilerSettings NO_POLICY_SCOPE)
 
 include(GNUInstallDirs) # Standard directories for installation

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
@@ -172,11 +172,11 @@ target_compile_definitions(${PROJECT_NAME}
 
 export(TARGETS ${PROJECT_NAME} FILE "${CMAKE_BINARY_DIR}/${PROJECT_NAME}-targets.cmake")
 
-include(create_portable_headers)
 
-create_portable_headers(${PROJECT_NAME}_PORTABLE_HEADERS
-    NAMESPACE "${${PROJECT_NAME}_NAMESPACE}/"
-    FILENAMES ${${PROJECT_NAME}_PUBLIC_CLASSES}
+lxqt_create_portable_headers(${PROJECT_NAME}_PORTABLE_HEADERS
+    PATH_PREFIX ".."
+    NAME_PREFIX "${${PROJECT_NAME}_NAMESPACE}"
+    HEADER_NAMES ${${PROJECT_NAME}_PUBLIC_CLASSES}
 )
 
 # Copy public headers for intree building

diff --git a/cmake/create_portable_headers.cmake b/cmake/create_portable_headers.cmake
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
@@ -153,10 +153,9 @@ target_compile_definitions(${PROJECT_NAME}
 
 export(TARGETS ${PROJECT_NAME} APPEND FILE "${CMAKE_BINARY_DIR}/${PROJECT_NAME}-targets.cmake")
 
-include(create_portable_headers)
-create_portable_headers(${PROJECT_NAME}_PORTABLE_HEADERS
-    NAMESPACE "${${PROJECT_NAME}_HEADER_NAMESPACE}/"
-    FILENAMES ${${PROJECT_NAME}_PUBLIC_CLASSES}
+lxqt_create_portable_headers(${PROJECT_NAME}_PORTABLE_HEADERS
+    PATH_PREFIX ".."
+    HEADER_NAMES ${${PROJECT_NAME}_PUBLIC_CLASSES}
 )
 
 # Copy public headers for intree building