Workaround for command dependencies (PRE_BUILD)

Author: philip1337

build/write_version.py

@@ -25,7 +25,7 @@ def ParseIncludeFile(srcInclude, dstInclude, rev):
 			for line in sF:
 				dF.write(line.replace("{{GIT_REVISION}}", rev))
 
-def main(srcDir, srcInclude, dstInclude):
+def main(srcDir, srcInclude, dstInclude, versionPath):
 	# Get rev
 	rev = GetRevision(srcDir)
 	branch = GetBranchName(srcDir)
@@ -41,7 +41,7 @@ def main(srcDir, srcInclude, dstInclude):
 		"#define BUILD_DATE \"{0}\"".format(datetime.datetime.now())
 	)
 
-	with open("{}/src/Version.hpp".format(srcDir), "w+") as f:
+	with open("{}".format(versionPath), "w+") as f:
 		f.write("\n".join(lines))
 
 if __name__ == "__main__":

src/CMakeLists.txt

@@ -1,6 +1,9 @@
 include(AMXConfig)
 include(AddSAMPPlugin)
 
+# Create dummy target that does nothing
+add_custom_target(spdloglib_deps)
+
 set(SOURCE_FILES
 	Logprintf.cpp
 	Natives.cpp
@@ -29,11 +32,35 @@ target_compile_definitions(
 	BOOST_ALL_NO_LIB
 )
 
+# SPDLog Include file handling
+set(SPDLOG_VERSION_FILE "${SAMP_LOG_BIN_ROOT}/Version.hpp")
+set(SPDLOG_INCLUDE_RAW "${SAMP_LOG_ROOT}/include/a_spdlog.inc.in")
+set(SPDLOG_INCLUDE_SRC "${SAMP_LOG_BIN_ROOT}/a_spdlog.inc")
+set(SPDLOG_INCLUDE_DST "${SAMP_LOG_BIN_OUT_DIR}/include/a_spdlog.inc")
+
+# Parse include file to out
+add_custom_command(
+        TARGET  spdloglib_deps POST_BUILD
+        COMMAND ${PYTHON_EXECUTABLE} ${SAMP_LOG_ROOT}/build/write_version.py ${SAMP_LOG_ROOT} ${SPDLOG_INCLUDE_RAW} ${SPDLOG_INCLUDE_SRC} ${SPDLOG_VERSION_FILE}
+		COMMENT "Generate version file")
+
+# Copy to output directorry (we also can write the file 
+# directly but then we need to create also the directory tree)
+add_custom_command(
+        TARGET  spdloglib_deps POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy
+                ${SPDLOG_INCLUDE_SRC}
+                ${SPDLOG_INCLUDE_DST}
+		COMMENT "Copy Pawno include file")
+
+# Deps
+add_dependencies(spdloglib spdloglib_deps)
+		
 # Link
 target_link_libraries(spdloglib boost-lib-filesystem sampsdk spdlog)
 
 # Includes
-target_include_directories(spdloglib PRIVATE ${BOOST_LIB_PATH})
+target_include_directories(spdloglib PRIVATE ${BOOST_LIB_PATH} ${SAMP_LOG_BIN_ROOT})
 
 # Properties
 set_target_properties(spdloglib PROPERTIES OUTPUT_NAME "spdlog")
@@ -45,21 +72,3 @@ set_target_properties(spdloglib
     LIBRARY_OUTPUT_DIRECTORY "${SAMP_LOG_BIN_OUT_DIR}"
     RUNTIME_OUTPUT_DIRECTORY "${SAMP_LOG_BIN_OUT_DIR}"
 )
-
-# SPDLog Include file handling
-set(SPDLOG_INCLUDE_RAW "${SAMP_LOG_ROOT}/include/a_spdlog.inc.in")
-set(SPDLOG_INCLUDE_SRC "${SAMP_LOG_BIN_ROOT}/a_spdlog.inc")
-set(SPDLOG_INCLUDE_DST "${SAMP_LOG_BIN_OUT_DIR}/include/a_spdlog.inc")
-
-# Parse include file to out
-add_custom_command(
-        TARGET  spdloglib PRE_BUILD
-        COMMAND ${PYTHON_EXECUTABLE} ${SAMP_LOG_ROOT}/build/write_version.py ${SAMP_LOG_ROOT} ${SPDLOG_INCLUDE_RAW} ${SPDLOG_INCLUDE_SRC})
-
-# Copy to output directorry (we also can write the file 
-# directly but then we need to create also the directory tree)
-add_custom_command(
-        TARGET  spdloglib POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy
-                ${SPDLOG_INCLUDE_SRC}
-                ${SPDLOG_INCLUDE_DST})

src/Natives.cpp

@@ -4,7 +4,7 @@
 
 #include "Logger.hpp"
 #include "Natives.hpp"
-#include "Version.hpp"
+#include <Version.hpp>
 
 #include <iostream>
 #include <memory>

src/Plugin.cpp

@@ -9,7 +9,7 @@
 // SAMP SDK & Log handler
 #include "plugin.h"
 #include "Logprintf.hpp"
-#include "Version.hpp"
+#include <Version.hpp>
 
 // SPDLog
 #include <spdlog/spdlog.h>