build_environment: cleanup harvest on windows
authorRay Molenkamp <github@lazydodo.com>
Sun, 26 Aug 2018 01:38:47 +0000 (19:38 -0600)
committerRay Molenkamp <github@lazydodo.com>
Sun, 26 Aug 2018 01:38:47 +0000 (19:38 -0600)
build_files/build_environment/cmake/harvest.cmake
build_files/build_environment/cmake/lcms.cmake
build_files/build_environment/cmake/pthreads.cmake
build_files/build_environment/cmake/tinyxml.cmake
build_files/build_environment/cmake/yamlcpp.cmake

index 57b76fdd1bd0685db7e5b13f64e9cc16dd0df7be..e79bab3354a2cf29f0fead7021c1b22185b64af6 100644 (file)
@@ -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 &&
index f67a85c3721080eb488408236a3d131df5d6e036..5a7c460ea6795929beab2898e80457b2483c2152 100644 (file)
@@ -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
index c93f0866aa9f3253308f0cba71f916ee2e9b6163..39fc93e8d392a3fa2f8322a90646eb303abf8a0a 100644 (file)
@@ -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()
index fb28e7cce2f908a0b15d37289316c6557bbda2e7..28dfb01bbefcbbd7d83371aad2fcd713bfa51018 100644 (file)
@@ -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
index 308f7d883610e853fa71c18e5fd87c5f160326b9..d7efb8b1d1e22f3200d7ad3a0c64e2bba4e6f7f0 100644 (file)
@@ -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