cmake bugfix #include-s order and pch.h

silverqx · May 22, 2024 · 5b924cc · 5b924cc
1 parent 3028254
commit 5b924cc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -262,6 +262,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     )
 endif()
 
+# Order of #include-s is very important because of pch.h as its name is the same for all
+# projects, the ${PROJECT_SOURCE_DIR}/include must be as the first #include!
 target_include_directories(${TinyOrm_target}
     PUBLIC "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
 )

diff --git a/drivers/common/CMakeLists.txt b/drivers/common/CMakeLists.txt
@@ -94,12 +94,12 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     )
 endif()
 
+# Order of #include-s is very important because of pch.h as its name is the same for all
+# projects, the ${PROJECT_SOURCE_DIR}/include must be as the first #include!
 target_include_directories(${TinyDrivers_target}
-    PUBLIC
-        "$<BUILD_INTERFACE:${${TinyOrm_ns}_SOURCE_DIR}/include>"
-        "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
-    PRIVATE
-        "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include_private>"
+    PUBLIC  "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
+    PRIVATE "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include_private>"
+    PUBLIC  "$<BUILD_INTERFACE:${${TinyOrm_ns}_SOURCE_DIR}/include>"
 )
 
 if(BUILD_MYSQL_DRIVER)

diff --git a/drivers/mysql/CMakeLists.txt b/drivers/mysql/CMakeLists.txt
@@ -82,6 +82,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     )
 endif()
 
+# Order of #include-s is very important because of pch.h as its name is the same for all
+# projects, the ${PROJECT_SOURCE_DIR}/include must be as the first #include!
 target_include_directories(${TinyMySql_target}
     PRIVATE
         "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"