summaryrefslogtreecommitdiff
path: root/Userland/Libraries
diff options
context:
space:
mode:
authorTimothy Flynn <trflynn89@pm.me>2022-01-25 21:51:08 -0500
committerAndreas Kling <kling@serenityos.org>2022-01-26 16:37:38 +0100
commit99c8dadcecf92cabca1bc93fd23db89332a46073 (patch)
tree39d0448bf9037eba681c11eb0b0992bef6fbd3cb /Userland/Libraries
parent1422187427f31a911417c1135c5ad8d618642f15 (diff)
downloadserenity-99c8dadcecf92cabca1bc93fd23db89332a46073.zip
LibEDID: Use correct paths for LibEDID generated files
Code generators that generate their files for both Lagom and Serenity have a blob in their CMake file like this: set(TIME_ZONE_DATA_HEADER LibTimeZone/TimeZoneData.h) set(TIME_ZONE_DATA_IMPLEMENTATION LibTimeZone/TimeZoneData.cpp) set(TIME_ZONE_META_TARGET_PREFIX LibTimeZone_) if (CMAKE_CURRENT_BINARY_DIR MATCHES ".*/LibTimeZone") # Serenity build. set(TIME_ZONE_DATA_HEADER TimeZoneData.h) set(TIME_ZONE_DATA_IMPLEMENTATION TimeZoneData.cpp) set(TIME_ZONE_META_TARGET_PREFIX "") endif() LibEDID generates files only for Serenity, but was using the Lagom build version of the _HEADER, _IMPLEMENTATION, and _PREFIX variables. Thus if pnp_ids.cmake was ever touched, the following error would be raised: Userland/Libraries/LibEDID/EDID.cpp:18:18: fatal error: LibEDID/PnpIDs.h: No such file or directory 18 | # include <LibEDID/LibEDID/PnpIDs.h> Use the Serenity paths in pnp_ids.cmake and in the #include within LibEDID itself.
Diffstat (limited to 'Userland/Libraries')
-rw-r--r--Userland/Libraries/LibEDID/EDID.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Userland/Libraries/LibEDID/EDID.cpp b/Userland/Libraries/LibEDID/EDID.cpp
index bbf8f97efe..7e3b5f8d0d 100644
--- a/Userland/Libraries/LibEDID/EDID.cpp
+++ b/Userland/Libraries/LibEDID/EDID.cpp
@@ -15,7 +15,7 @@
# include <unistd.h>
# ifdef ENABLE_PNP_IDS_DATA
-# include <LibEDID/LibEDID/PnpIDs.h>
+# include <LibEDID/PnpIDs.h>
# endif
#endif