[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra] libs/odf/writeodf: Revert rng2cpp detection on non-Windows.
From:       Andrius da Costa Ribas <andriusmao () gmail ! com>
Date:       2013-11-30 19:43:55
Message-ID: E1VmqSJ-0003VO-5t () scm ! kde ! org
[Download RAW message or body]

Git commit 512ec6cd111ff4fc61f17213b1de19f0cfc4a932 by Andrius da Costa Rib=
as.
Committed on 30/11/2013 at 19:40.
Pushed by andriusr into branch 'master'.

Revert rng2cpp detection on non-Windows.

M  +22   -12   libs/odf/writeodf/CMakeLists.txt

http://commits.kde.org/calligra/512ec6cd111ff4fc61f17213b1de19f0cfc4a932

diff --git a/libs/odf/writeodf/CMakeLists.txt b/libs/odf/writeodf/CMakeList=
s.txt
index 3d1b45f..9a99d48 100644
--- a/libs/odf/writeodf/CMakeLists.txt
+++ b/libs/odf/writeodf/CMakeLists.txt
@@ -1,15 +1,25 @@
 set(RNGFILE ${CMAKE_SOURCE_DIR}/devtools/scripts/OpenDocument-v1.2-cs01-sc=
hema-calligra.rng)
 set(RNGHEADERDIR ${CMAKE_BINARY_DIR}/libs/odf/writeodf)
-find_program(RNG2CCP_EXECUTABLE rng2cpp
-    ${CMAKE_BINARY_DIR}/devtools/rng2cpp
-    ${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}
-    ${CMAKE_BINARY_DIR}/bin
-)
-add_custom_command(
-    OUTPUT ${RNGHEADERDIR}/writeodf.h
-    COMMAND ${RNG2CCP_EXECUTABLE}
-    ARGS ${RNGFILE} ${RNGHEADERDIR}
-    DEPENDS rng2cpp ${RNGFILE}
-    WORKING_DIRECTORY ${RNGHEADERDIR}
-)
+if (WIN32)
+    find_program(RNG2CCP_EXECUTABLE rng2cpp
+        ${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}
+        ${CMAKE_BINARY_DIR}/bin
+    )
+    add_custom_command(
+        OUTPUT ${RNGHEADERDIR}/writeodf.h
+        COMMAND ${RNG2CCP_EXECUTABLE}
+        ARGS ${RNGFILE} ${RNGHEADERDIR}
+        DEPENDS rng2cpp ${RNGFILE}
+        WORKING_DIRECTORY ${RNGHEADERDIR}
+    )
+else (WIN32)
+    set(RNG2CPP_LOCATION ${CMAKE_BINARY_DIR}/devtools/rng2cpp)
+    add_custom_command(
+        OUTPUT ${RNGHEADERDIR}/writeodf.h
+        COMMAND ${RNG2CPP_LOCATION}/rng2cpp
+        ARGS ${RNGFILE} ${RNGHEADERDIR}
+        DEPENDS rng2cpp ${RNGFILE}
+        WORKING_DIRECTORY ${RNGHEADERDIR}
+    )
+endif (WIN32)
 add_custom_target(writeodf.h-target DEPENDS writeodf.h)

[prev in list] [next in list] [prev in thread] [next in thread]