Commit: b17591731d7747fc12a56f5c6868e5b0f9fe0b4d
Author: Brecht Van Lommel
Date: Mon Jan 14 15:09:48 2019 +0100
Branches: blender2.7
https://developer.blender.org/rBb17591731d7747fc12a56f5c6868e5b0f9fe0b4d
Build environment: fixes for Linux debug libraries build.
===================================================================
M build_files/build_environment/CMakeLists.txt
M build_files/build_environment/cmake/png.cmake
M build_files/build_environment/cmake/tiff.cmake
M build_files/build_environment/cmake/zlib.cmake
===================================================================
diff --git a/build_files/build_environment/CMakeLists.txt
b/build_files/build_environment/CMakeLists.txt
index 8c1d38c0635..f76c8175e50 100644
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -114,7 +114,7 @@ endif()
if(NOT WIN32 OR ENABLE_MINGW64)
include(cmake/openjpeg.cmake)
- if(BUILD_MODE STREQUAL Release)
+ if(NOT WIN32 OR BUILD_MODE STREQUAL Release)
if(WIN32)
include(cmake/zlib_mingw.cmake)
endif()
diff --git a/build_files/build_environment/cmake/png.cmake
b/build_files/build_environment/cmake/png.cmake
index 803438cbd2a..6e51fb9ebe4 100644
--- a/build_files/build_environment/cmake/png.cmake
+++ b/build_files/build_environment/cmake/png.cmake
@@ -36,7 +36,7 @@ add_dependencies(
external_zlib
)
-if(BUILD_MODE STREQUAL Debug)
+if(WIN32 AND BUILD_MODE STREQUAL Debug)
ExternalProject_Add_Step(external_png after_install
COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/png/lib/libpng16_staticd${LIBEXT} ${LIBDIR}/png/lib/libpng16${LIBEXT}
DEPENDEES install
diff --git a/build_files/build_environment/cmake/tiff.cmake
b/build_files/build_environment/cmake/tiff.cmake
index 0f22daf05b1..498145463cf 100644
--- a/build_files/build_environment/cmake/tiff.cmake
+++ b/build_files/build_environment/cmake/tiff.cmake
@@ -39,7 +39,7 @@ add_dependencies(
external_zlib
)
-if(BUILD_MODE STREQUAL Debug)
+if(WIN32 AND BUILD_MODE STREQUAL Debug)
ExternalProject_Add_Step(external_tiff after_install
COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/tiff/lib/tiffd${LIBEXT} ${LIBDIR}/tiff/lib/tiff${LIBEXT}
DEPENDEES install
diff --git a/build_files/build_environment/cmake/zlib.cmake
b/build_files/build_environment/cmake/zlib.cmake
index 396bb3a318e..3c07fb3c08a 100644
--- a/build_files/build_environment/cmake/zlib.cmake
+++ b/build_files/build_environment/cmake/zlib.cmake
@@ -40,16 +40,8 @@ if (WIN32)
)
endif()
else()
- if(BUILD_MODE STREQUAL Debug)
- ExternalProject_Add_Step(external_zlib after_install
- COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/zlib/lib/zlibstaticd${LIBEXT} ${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
- DEPENDEES install
- )
- endif()
- if (UNIX)
- ExternalProject_Add_Step(external_zlib after_install
- COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/zlib/lib/libz.a ${LIBDIR}/zlib/lib/libz_pic.a
- DEPENDEES install
- )
- endif()
+ ExternalProject_Add_Step(external_zlib after_install
+ COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/libz.a
${LIBDIR}/zlib/lib/libz_pic.a
+ DEPENDEES install
+ )
endif()
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
