Commit: 0339964ea8c63f3fc0fcfeae7184ea3ce59976f7
Author: Ray Molenkamp
Date: Sat Aug 25 19:38:47 2018 -0600
Branches: master
https://developer.blender.org/rB0339964ea8c63f3fc0fcfeae7184ea3ce59976f7
build_environment: cleanup harvest on windows
===================================================================
M build_files/build_environment/cmake/harvest.cmake
M build_files/build_environment/cmake/lcms.cmake
M build_files/build_environment/cmake/pthreads.cmake
M build_files/build_environment/cmake/tinyxml.cmake
M build_files/build_environment/cmake/yamlcpp.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/harvest.cmake
b/build_files/build_environment/cmake/harvest.cmake
index 57b76fdd1bd..e79bab3354a 100644
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -31,9 +31,6 @@ if(BUILD_MODE STREQUAL Release)
COMMAND # jpeg rename libfile + copy include
${CMAKE_COMMAND} -E copy
${LIBDIR}/jpg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/jpg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
- # pthreads, rename include dir
- ${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/pthreads/inc/ ${HARVEST_TARGET}/pthreads/include/ &&
- ${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/pthreads/lib/ ${HARVEST_TARGET}/pthreads/lib &&
# OpenImageIO
${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include &&
${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib &&
diff --git a/build_files/build_environment/cmake/lcms.cmake
b/build_files/build_environment/cmake/lcms.cmake
index f67a85c3721..5a7c460ea67 100644
--- a/build_files/build_environment/cmake/lcms.cmake
+++ b/build_files/build_environment/cmake/lcms.cmake
@@ -28,11 +28,4 @@ ExternalProject_Add(external_lcms
PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_lcms.txt
${BUILD_DIR}/lcms/src/external_lcms/CMakeLists.txt
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/lcms ${DEFAULT_CMAKE_FLAGS}
${LCMS_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/lcms
-)
-
-#if(BUILD_MODE STREQUAL Release AND WIN32)
- #ExternalProject_Add_Step(external_freetype after_install
- # COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freetype
${HARVEST_TARGET}/freetype
- # DEPENDEES install
- #)
-#endif()
+)
\ No newline at end of file
diff --git a/build_files/build_environment/cmake/pthreads.cmake
b/build_files/build_environment/cmake/pthreads.cmake
index c93f0866aa9..39fc93e8d39 100644
--- a/build_files/build_environment/cmake/pthreads.cmake
+++ b/build_files/build_environment/cmake/pthreads.cmake
@@ -43,4 +43,13 @@ if(WIN32)
${CMAKE_COMMAND} -E copy
${BUILD_DIR}/pthreads/src/external_pthreads/semaphore.h
${LIBDIR}/pthreads/inc/semaphore.h
INSTALL_DIR ${LIBDIR}/pthreads
)
+
+ if(BUILD_MODE STREQUAL Release)
+ ExternalProject_Add_Step(external_pthreads after_install
+ COMMAND ${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/pthreads/inc/ ${HARVEST_TARGET}/pthreads/include/
+ COMMAND ${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/pthreads/lib/ ${HARVEST_TARGET}/pthreads/lib
+ DEPENDEES install
+ )
+ endif()
+
endif()
diff --git a/build_files/build_environment/cmake/tinyxml.cmake
b/build_files/build_environment/cmake/tinyxml.cmake
index fb28e7cce2f..28dfb01bbef 100644
--- a/build_files/build_environment/cmake/tinyxml.cmake
+++ b/build_files/build_environment/cmake/tinyxml.cmake
@@ -28,11 +28,4 @@ ExternalProject_Add(external_tinyxml
PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d
${BUILD_DIR}/tinyxml/src/external_tinyxml < ${PATCH_DIR}/tinyxml.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tinyxml
${DEFAULT_CMAKE_FLAGS} ${TINYXML_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/tinyxml
-)
-
-#if(BUILD_MODE STREQUAL Release AND WIN32)
- #ExternalProject_Add_Step(external_freetype after_install
- # COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freetype
${HARVEST_TARGET}/freetype
- # DEPENDEES install
- #)
-#endif()
+)
\ No newline at end of file
diff --git a/build_files/build_environment/cmake/yamlcpp.cmake
b/build_files/build_environment/cmake/yamlcpp.cmake
index 308f7d88361..d7efb8b1d1e 100644
--- a/build_files/build_environment/cmake/yamlcpp.cmake
+++ b/build_files/build_environment/cmake/yamlcpp.cmake
@@ -31,11 +31,4 @@ ExternalProject_Add(external_yamlcpp
PREFIX ${BUILD_DIR}/yamlcpp
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/yamlcpp
${DEFAULT_CMAKE_FLAGS} ${YAMLCPP_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/yamlcpp
-)
-
-#if(BUILD_MODE STREQUAL Release AND WIN32)
- #ExternalProject_Add_Step(external_freetype after_install
- # COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freetype
${HARVEST_TARGET}/freetype
- # DEPENDEES install
- #)
-#endif()
+)
\ No newline at end of file
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
