Tera TermRevision: 10050
https://osdn.net/projects/ttssh2/scm/svn/commits/10050
Author: zmatsuo
Date: 2022-07-14 00:26:14 +0900 (Thu, 14 Jul 2022)
Log Message:
-----------
cmakeビルドでonigurumaをビルドするときのオプションを誤っていたので修正
- mingw, nmakeビルドのときdll版onigurumaをビルドしていた
- パラレルビルドできていなかったので修正
Modified Paths:
--------------
trunk/libs/buildoniguruma.cmake
-------------- next part --------------
Modified: trunk/libs/buildoniguruma.cmake
===================================================================
--- trunk/libs/buildoniguruma.cmake 2022-07-09 03:44:50 UTC (rev 10049)
+++ trunk/libs/buildoniguruma.cmake 2022-07-13 15:26:14 UTC (rev 10050)
@@ -97,11 +97,10 @@
list(APPEND GENERATE_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
list(APPEND GENERATE_OPTIONS "-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}")
list(APPEND GENERATE_OPTIONS "-DCMAKE_DEBUG_POSTFIX=d")
- list(APPEND GENERATE_OPTIONS "-DBUILD_SHARED_LIBS=OFF")
- list(APPEND GENERATE_OPTIONS "-DMSVC_STATIC_RUNTIME=ON")
+ list(APPEND GENERATE_OPTIONS "-DBUILD_SHARED_LIBS=OFF")
if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
list(APPEND GENERATE_OPTIONS "-DMSVC=on")
- list(APPEND GENERATE_OPTIONS "-DUSE_STATIC_MSVC_RUNTIMES=on")
+ list(APPEND GENERATE_OPTIONS "-DMSVC_STATIC_RUNTIME=ON")
endif()
cmake_generate("${CMAKE_GENERATOR}" "${SRC_DIR}" "${BUILD_DIR}" "${GENERATE_OPTIONS}")
@@ -123,15 +122,16 @@
endif(CMAKE_HOST_UNIX)
list(APPEND GENERATE_OPTIONS "-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}")
list(APPEND GENERATE_OPTIONS "-DCMAKE_BUILD_TYPE=Release")
+ list(APPEND GENERATE_OPTIONS "-DBUILD_SHARED_LIBS=OFF")
if(("${CMAKE_GENERATOR}" MATCHES "Visual Studio") OR ("${CMAKE_GENERATOR}" MATCHES "NMake Makefiles"))
list(APPEND GENERATE_OPTIONS "-DMSVC=on")
- list(APPEND GENERATE_OPTIONS "-DUSE_STATIC_MSVC_RUNTIMES=on")
+ list(APPEND GENERATE_OPTIONS "-DMSVC_STATIC_RUNTIME=ON")
endif()
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)