diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-07-16 03:47:10 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-07-16 03:47:10 +0400 |
| commit | 2fd69c518508b8195e146a3067af3197f76707b3 (patch) | |
| tree | d77b783dc0824904d1b90dd0740a2ed3e3354ea9 /source/blender | |
| parent | 8a990a8318033d9684257afc837f17af5725ecc7 (diff) | |
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
Diffstat (limited to 'source/blender')
| -rwxr-xr-x | source/blender/python/manta_pp/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | source/blender/python/manta_pp/source/general.cpp | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/source/blender/python/manta_pp/CMakeLists.txt b/source/blender/python/manta_pp/CMakeLists.txt index afde8ed0979..b9037112992 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 3704c52fe2f..bd029bbb203 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; |