From: Iceyer <me@iceyer.net>
Date: Tue, 3 Apr 2018 02:57:05 +0000 (+0800)
Subject: fix: build failed on windows
X-Git-Tag: archive/raspbian/5.7.12-2+rpi1^2~122^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d1457ea7e1ef1209bfc4e74361d99a1ba31d6df2;p=dtkcore.git

fix: build failed on windows

Change-Id: I322946ea5518c89c70c86d66550db9165d1dadec
---

diff --git a/src/dtk_cmake.prf b/src/dtk_cmake.prf
index 103d41f..f6ea194 100644
--- a/src/dtk_cmake.prf
+++ b/src/dtk_cmake.prf
@@ -36,9 +36,9 @@ CMAKE_CONTENT += "set($${CMAKE_MODULE_INCLUDE_DIR} \"$${INC_DIR}\")"
 CMAKE_CONTENT += "set($${CMAKE_MODULE}_LIBRARIES $$TARGET$$LINK_LIBRARIES)"
 CMAKE_CONTENT += "include_directories(\"${"$${CMAKE_MODULE_INCLUDE_DIR}"}\")"
 
-CMAKE_DIR=$$WORK_DIR/../cmake/$${CMAKE_MODULE}/
+CMAKE_DIR=$$WORK_DIR/../cmake/$${CMAKE_MODULE}
 CMAKE_PATH=$$CMAKE_DIR/$${CMAKE_MODULE}Config.cmake
-mkpath(CMAKE_DIR)
+mkpath($$CMAKE_DIR)
 message("write cmake file to $$CMAKE_PATH")
 write_file($$CMAKE_PATH, CMAKE_CONTENT) | error("Aborting.")
 
diff --git a/src/version.pri b/src/version.pri
index f1f6d21..30097ba 100644
--- a/src/version.pri
+++ b/src/version.pri
@@ -4,7 +4,7 @@ isEmpty(VERSION) {
         !isEmpty(PKG_CONFIG): VERSION = $$system($$PKG_CONFIG --modversion dtkcore)
     }
 
-    isEmpty(VERSION): VERSION = $$system(git describe --tags --abbrev=0)
+    isEmpty(VERSION): VERSION = $$system(git -C $$_PRO_FILE_PWD_ describe --tags --abbrev=0)
     isEmpty(VERSION): VERSION = $$DTK_VERSION
     isEmpty(VERSION): error(VERSION is empty)
     VERSION = $$replace(VERSION, [^0-9.],)