Tera TermRevision: 10054
https://osdn.net/projects/ttssh2/scm/svn/commits/10054
Author: zmatsuo
Date: 2022-07-14 00:26:54 +0900 (Thu, 14 Jul 2022)
Log Message:
-----------
cmakeビルドで、nmakeを使用するときエラーが出ることがあったので修正
- debug指定でビルドしたとき
- cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Debug
- lib/ のファイルは debug 版ではなく release 版をリンクするようにした
Modified Paths:
--------------
trunk/libs/lib_SFMT.cmake
trunk/libs/lib_libressl.cmake
trunk/libs/lib_oniguruma.cmake
trunk/libs/lib_zlib.cmake
-------------- next part --------------
Modified: trunk/libs/lib_SFMT.cmake
===================================================================
--- trunk/libs/lib_SFMT.cmake 2022-07-13 15:26:44 UTC (rev 10053)
+++ trunk/libs/lib_SFMT.cmake 2022-07-13 15:26:54 UTC (rev 10054)
@@ -12,9 +12,12 @@
if(MINGW)
set(SFMT_LIB ${SFMT_LIBRARY_DIRS}/libsfmt.a)
else()
- set(SFMT_LIB
- optimized ${SFMT_LIBRARY_DIRS}/sfmt.lib
- debug ${SFMT_LIBRARY_DIRS}/sfmtd.lib
-# debug ${SFMT_LIBRARY_DIRS}/sfmt.lib
+ if(GENERATOR_IS_MULTI_CONFIG)
+ set(SFMT_LIB
+ optimized ${SFMT_LIBRARY_DIRS}/sfmt.lib
+ debug ${SFMT_LIBRARY_DIRS}/sfmtd.lib
)
+ else()
+ set(SFMT_LIB ${SFMT_LIBRARY_DIRS}/sfmt.lib)
+ endif()
endif()
Modified: trunk/libs/lib_libressl.cmake
===================================================================
--- trunk/libs/lib_libressl.cmake 2022-07-13 15:26:44 UTC (rev 10053)
+++ trunk/libs/lib_libressl.cmake 2022-07-13 15:26:54 UTC (rev 10054)
@@ -6,22 +6,19 @@
set(LIBRESSL_ROOT "${LIBRESSL_ROOT}_x64")
endif()
+set(LIBRESSL_INCLUDE_DIRS ${LIBRESSL_ROOT}/include)
if(MINGW)
- set(LIBRESSL_INCLUDE_DIRS
- ${LIBRESSL_ROOT}/include
- )
-
set(LIBRESSL_LIB
${LIBRESSL_ROOT}/lib/libcrypto-47.a
bcrypt
)
else()
- set(LIBRESSL_INCLUDE_DIRS
- ${LIBRESSL_ROOT}/include
+ if(GENERATOR_IS_MULTI_CONFIG)
+ set(LIBRESSL_LIB
+ debug ${LIBRESSL_ROOT}/lib/crypto-47d.lib
+ optimized ${LIBRESSL_ROOT}/lib/crypto-47.lib
)
-
- set(LIBRESSL_LIB
- debug ${LIBRESSL_ROOT}/lib/crypto-47d.lib
- optimized ${LIBRESSL_ROOT}/lib/crypto-47.lib
- )
+ else()
+ set(LIBRESSL_LIB ${LIBRESSL_ROOT}/lib/crypto-47.lib)
+ endif()
endif()
Modified: trunk/libs/lib_oniguruma.cmake
===================================================================
--- trunk/libs/lib_oniguruma.cmake 2022-07-13 15:26:44 UTC (rev 10053)
+++ trunk/libs/lib_oniguruma.cmake 2022-07-13 15:26:54 UTC (rev 10054)
@@ -14,8 +14,14 @@
if(MINGW)
set(ONIGURUMA_LIB ${ONIGURUMA_LIBRARY_DIRS}/libonig.a)
else()
- set(ONIGURUMA_LIB
- debug ${ONIGURUMA_LIBRARY_DIRS}/onigd.lib
- optimized ${ONIGURUMA_LIBRARY_DIRS}/onig.lib
+ if(GENERATOR_IS_MULTI_CONFIG)
+ set(ONIGURUMA_LIB
+ debug ${ONIGURUMA_LIBRARY_DIRS}/onigd.lib
+ optimized ${ONIGURUMA_LIBRARY_DIRS}/onig.lib
)
+ else()
+ set(ONIGURUMA_LIB
+ ${ONIGURUMA_LIBRARY_DIRS}/onig.lib
+ )
+ endif()
endif()
Modified: trunk/libs/lib_zlib.cmake
===================================================================
--- trunk/libs/lib_zlib.cmake 2022-07-13 15:26:44 UTC (rev 10053)
+++ trunk/libs/lib_zlib.cmake 2022-07-13 15:26:54 UTC (rev 10054)
@@ -13,8 +13,12 @@
${ZLIB_LIBRARY_DIRS}/libzlibstatic.a
)
else()
- set(ZLIB_LIB
- debug ${ZLIB_LIBRARY_DIRS}/zlibstaticd.lib
- optimized ${ZLIB_LIBRARY_DIRS}/zlibstatic.lib
+ if(GENERATOR_IS_MULTI_CONFIG)
+ set(ZLIB_LIB
+ debug ${ZLIB_LIBRARY_DIRS}/zlibstaticd.lib
+ optimized ${ZLIB_LIBRARY_DIRS}/zlibstatic.lib
)
+ else()
+ set(ZLIB_LIB ${ZLIB_LIBRARY_DIRS}/zlibstatic.lib)
+ endif()
endif()