Changeset: bfb40e21a31a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bfb40e21a31a
Branch: Oct2020
Log Message:
merged
diffs (28 lines):
diff --git a/cmake/monetdb-custom-targets.cmake
b/cmake/monetdb-custom-targets.cmake
--- a/cmake/monetdb-custom-targets.cmake
+++ b/cmake/monetdb-custom-targets.cmake
@@ -86,7 +86,7 @@ endif()
if(CANDLE_FOUND)
add_custom_target(create-wix-packages
COMMAND
- ${CMAKE_CPACK_COMMAND} -G WIX -C Debug
+ ${CMAKE_CPACK_COMMAND} -G WIX -C Release
WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
else()
add_custom_target(create-wix-packages
diff --git a/sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
b/sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
--- a/sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
+++ b/sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
@@ -77,10 +77,10 @@ if(HAVE_LIBPY3)
configure_file(pyapi_locatepython3.bat.in
${CMAKE_CURRENT_BINARY_DIR}/pyapi_locatepython3.bat @ONLY)
- install(FILES $<TARGET_PDB_FILE:pyapi3> DESTINATION ${LIBDIR}/monetdb5
OPTIONAL)
+ install(FILES $<TARGET_PDB_FILE:pyapi3> DESTINATION
${CMAKE_INSTALL_LIBDIR}/monetdb5 OPTIONAL)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/pyapi_locatepython3.bat
- DESTINATION ${CMAKE_INSTALL_PREFIX}
+ DESTINATION "."
COMPONENT server)
endif()
endif()
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
