cleanup

Author: ladnir

build.py

@@ -161,6 +161,7 @@ def main(projectName, argv):
     argv = replace(argv, "--relic", "-DENABLE_RELIC=ON -DFETCH_RELIC=ON")
     argv = replace(argv, "--boost", "-DENABLE_BOOST=ON -DFETCH_BOOST=ON")
     argv = replace(argv, "--sodium", "-DENABLE_SODIUM=ON -DFETCH_SODIUM=ON")
+    argv = replace(argv, "--openssl", "-DENABLE_OPENSSL=ON")
     argv = replace(argv, "--sudo", "-DSUDO_FETCH=ON")
 
     argv, install = parseInstallArgs(argv)

thirdparty/fetch.cmake

@@ -1,9 +1,4 @@
 
-if(DEFINED LOG_FILE AND (NOT DEFINED VERBOSE_FETCH OR NOT VERBOSE_FETCH))
-    set(LOG_SETTING OUTPUT_FILE ${LOG_FILE} ERROR_FILE ${LOG_FILE} ${OUTPUT_QUIET})
-else()
-    unset(LOG_SETTING)
-endif()
 
 function(RUN)
     cmake_parse_arguments(
@@ -15,24 +10,15 @@ function(RUN)
     )
     message("${PARSED_ARGS_NAME}")
 
-    if(DEFINED LOG_FILE)
-        file(APPEND ${LOG_FILE}
-            "vvvvvvvvvvvvv RUN ${PARSED_ARGS_NAME} vvvvvvvvvvvv\n"
-            "${PARSED_ARGS_CMD}\n"
-            "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
-        )
-    endif()
 
     execute_process(
         COMMAND ${PARSED_ARGS_CMD}
         WORKING_DIRECTORY ${PARSED_ARGS_WD}
         RESULT_VARIABLE RESULT
         COMMAND_ECHO STDOUT
-        ${LOG_SETTING}
     )
     if(RESULT)
-        file(READ ${LOG_FILE} LOG_STRING)
-        message(FATAL_ERROR "${PARSED_ARGS_NAME} failed (${RESULT}).\nLOG:\n${LOG_STRING}")
+        message(FATAL_ERROR "${PARSED_ARGS_NAME} failed (${RESULT}).")
     endif()
 endfunction()
 
@@ -49,14 +35,6 @@ function(VSRUN)
         ${ARGN} # arguments of the function to parse, here we take the all original ones
     )
     message("${PARSED_ARGS_NAME}")
-
-    if(DEFINED LOG_FILE)
-        file(APPEND ${LOG_FILE}
-            "vvvvvvvvvvvvv VSRUN ${PARSED_ARGS_NAME} vvvvvvvvvvvv\n"
-            "${PARSED_ARGS_CMD}\n"
-            "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
-        )
-    endif()
 
     set(TEMP_PATH "${CMAKE_CURRENT_LIST_DIR}/runvs-${PARSED_ARGS_NAME}_delete-me.ps1")
     file(WRITE ${TEMP_PATH}  "${FINDVS}\n\n" ${PARSED_ARGS_CMD})
@@ -74,16 +52,10 @@ function(VSRUN)
         WORKING_DIRECTORY ${PARSED_ARGS_WD}
         RESULT_VARIABLE RESULT
         COMMAND_ECHO STDOUT
-        ${LOG_SETTING}
     )
 
     if(RESULT)
-        if(DEFINED LOG_FILE)
-            file(READ ${LOG_FILE} LOG_STRING)
-            message(FATAL_ERROR "${PARSED_ARGS_NAME} failed (${RESULT}).\nLOG:\n${LOG_STRING}")
-        else()
-            message(FATAL_ERROR "${PARSED_ARGS_NAME} failed (${RESULT})")
-        endif()
+        message(FATAL_ERROR "${PARSED_ARGS_NAME} failed (${RESULT})")
     endif()
 
     if(NOT DEFINED VSRUN_NO_DEL)