[10052] cmakeビルドで、libresslビルド時のコンパイルオプションを見直した (ttssh2-commit) - Tera Term

Revision: 10052
          https://osdn.net/projects/ttssh2/scm/svn/commits/10052
Author:   zmatsuo
Date:     2022-07-14 00:26:34 +0900 (Thu, 14 Jul 2022)
Log Message:
-----------
cmakeビルドで、libresslビルド時のコンパイルオプションを見直した

- 誤った引数を渡していたので修正
- パラレルビルドできるように修正

Modified Paths:
--------------
    trunk/libs/buildlibressl.cmake

-------------- next part --------------
Modified: trunk/libs/buildlibressl.cmake
===================================================================

--- trunk/libs/buildlibressl.cmake	2022-07-13 15:26:26 UTC (rev 10051)
+++ trunk/libs/buildlibressl.cmake	2022-07-13 15:26:34 UTC (rev 10052)
@@ -28,7 +28,7 @@
 # Configure + Generate
 function(cmake_generate GENERATOR SRC_DIR WORKING_DIR OPTIONS)
   execute_process(
-    COMMAND ${CMAKE_COMMAND} ${SRC_DIR} .. -G "${GENERATOR}" ${OPTIONS}
+    COMMAND ${CMAKE_COMMAND} ${SRC_DIR} -G "${GENERATOR}" ${OPTIONS}
     WORKING_DIRECTORY "${BUILD_DIR}"
     ENCODING AUTO
     RESULT_VARIABLE rv
@@ -124,7 +124,7 @@
     cmake_generate("${CMAKE_GENERATOR}" "${SRC_DIR}" "${BUILD_DIR}" "${GENERATE_OPTIONS}")
 
     if(${CMAKE_GENERATOR} MATCHES "Unix Makefiles")
-      set(APPEND BUILD_TOOL_OPTIONS "-j")
+      list(APPEND BUILD_TOOL_OPTIONS "-j")
     endif()
 
     unset(BUILD_OPTIONS)


Tera Term

[ttssh2-commit] [10052] cmakeビルドで、libresslビルド時のコンパイルオプションを見直した