Commit: 2fd69c518508b8195e146a3067af3197f76707b3
Author: Jens Verwiebe
Date: Wed Jul 16 01:47:10 2014 +0200
https://developer.blender.org/rB2fd69c518508b8195e146a3067af3197f76707b3
Fix generating temporary files with prep binary, also comment out include of
hgnfo header for now.
- I just uncommented failing code
- dunno whats up with hginfo, guess thats from external source versioncontrol
of manta (?)
- pls disable openmp, due this branch was not merged lately and misses omp
cmake fixes
I checked all is compiling fine now
===================================================================
M source/blender/python/manta_pp/CMakeLists.txt
M source/blender/python/manta_pp/source/general.cpp
===================================================================
diff --git a/source/blender/python/manta_pp/CMakeLists.txt
b/source/blender/python/manta_pp/CMakeLists.txt
index afde8ed..b903711 100755
--- a/source/blender/python/manta_pp/CMakeLists.txt
+++ b/source/blender/python/manta_pp/CMakeLists.txt
@@ -421,14 +421,15 @@ foreach(it ${PP_SOURCES} ${PP_HEADERS})
set(CURPP "${CMAKE_CURRENT_BINARY_DIR}/${PP_PATH}/${it}")
string(REPLACE "source/" "" INFILE ${it})
# preprocessor
- add_custom_command(OUTPUT ${CURPP}
- COMMAND echo Workingdir
- COMMAND pwd
- #COMMAND
${CMAKE_BINARY_DIR}/bin/Debug/prep generate ${PP_PREPD} ${MT_TYPE}
"${CMAKE_CURRENT_SOURCE_DIR}/source/" "${INFILE}" "${CURPP}"
- DEPENDS prep
- IMPLICIT_DEPENDS CXX ${it}
- #WORKING_DIRECTORY
${CMAKE_CURRENT_BINARY_DIR}
- )
+ execute_process(COMMAND ${CMAKE_BINARY_DIR}/bin/Debug/prep generate
${PP_PREPD} ${MT_TYPE} "${CMAKE_CURRENT_SOURCE_DIR}/source/" "${INFILE}"
"${CURPP}")
+# add_custom_command(OUTPUT ${CURPP}
+# COMMAND echo Workingdir
+# COMMAND pwd
+# #COMMAND
${CMAKE_BINARY_DIR}/bin/Debug/prep generate ${PP_PREPD} ${MT_TYPE}
"${CMAKE_CURRENT_SOURCE_DIR}/source/" "${INFILE}" "${CURPP}"
+# DEPENDS prep
+# IMPLICIT_DEPENDS CXX ${it}
+# #WORKING_DIRECTORY
${CMAKE_CURRENT_BINARY_DIR}
+# )
if ("${CUREXT}" STREQUAL ".h" OR "${CUREXT}" STREQUAL ".py")
list(APPEND PP_REGS "${CURPP}.reg")
list(APPEND PP_REGCPP "${CURPP}.reg.cpp")
diff --git a/source/blender/python/manta_pp/source/general.cpp
b/source/blender/python/manta_pp/source/general.cpp
index 3704c52..bd029bb 100644
--- a/source/blender/python/manta_pp/source/general.cpp
+++ b/source/blender/python/manta_pp/source/general.cpp
@@ -20,7 +20,7 @@
# undef NOMINMAX
#else
# include <sys/time.h>
-# include "hginfo.h"
+//# include "hginfo.h"
#endif
using namespace std;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
