[Ttssh2-commit] [7185] マージミス ? の調整とcmakeの調整

scmno****@osdn***** scmno****@osdn*****
2018年 8月 21日 (火) 23:53:27 JST


Revision: 7185
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7185
Author:   zmatsuo
Date:     2018-08-21 23:53:26 +0900 (Tue, 21 Aug 2018)
Log Message:
-----------
マージミス?の調整とcmakeの調整

Modified Paths:
--------------
    branches/cmake/libs/lib_openssl.cmake
    branches/cmake/teraterm/teraterm/ttdialog.c
    branches/cmake/teraterm/ttpdlg/CMakeLists.txt

-------------- next part --------------
Modified: branches/cmake/libs/lib_openssl.cmake
===================================================================
--- branches/cmake/libs/lib_openssl.cmake	2018-08-20 14:22:15 UTC (rev 7184)
+++ branches/cmake/libs/lib_openssl.cmake	2018-08-21 14:53:26 UTC (rev 7185)
@@ -1,14 +1,25 @@
 
 include(${CMAKE_CURRENT_LIST_DIR}/script_support.cmake)
 
-set(OPENSSL_INCLUDE_DIRS
-  "$<$<CONFIG:Debug>:${CMAKE_CURRENT_LIST_DIR}/openssl_${TOOLSET}_debug/include>"
-  "$<$<CONFIG:Release>:${CMAKE_CURRENT_LIST_DIR}/openssl_${TOOLSET}/include>"
+if(MINGW)
+  set(OPENSSL_INCLUDE_DIRS
+	${CMAKE_CURRENT_LIST_DIR}/openssl_${TOOLSET}/include
+	)
+
+  set(OPENSSL_LIB
+	${CMAKE_CURRENT_LIST_DIR}/openssl_${TOOLSET}/lib/libeay32.lib
   )
 
-set(OPENSSL_LIB
-  debug ${CMAKE_CURRENT_LIST_DIR}/openssl_${TOOLSET}_debug/lib/libeay32.lib
-#  debug ${CMAKE_CURRENT_LIST_DIR}/openssl_${TOOLSET}_debug/lib/ssleay32.lib
-  optimized ${CMAKE_CURRENT_LIST_DIR}/openssl_${TOOLSET}/lib/libeay32.lib
-#  optimized ${CMAKE_CURRENT_LIST_DIR}/openssl_${TOOLSET}/lib/ssleay32.lib
-  )
+else()
+
+  set(OPENSSL_INCLUDE_DIRS
+	"$<$<CONFIG:Debug>:${CMAKE_CURRENT_LIST_DIR}/openssl_${TOOLSET}_debug/include>"
+	"$<$<CONFIG:Release>:${CMAKE_CURRENT_LIST_DIR}/openssl_${TOOLSET}/include>"
+	)
+
+  set(OPENSSL_LIB
+	debug ${CMAKE_CURRENT_LIST_DIR}/openssl_${TOOLSET}_debug/lib/libeay32.lib
+	optimized ${CMAKE_CURRENT_LIST_DIR}/openssl_${TOOLSET}/lib/libeay32.lib
+	)
+
+endif()

Modified: branches/cmake/teraterm/teraterm/ttdialog.c
===================================================================
--- branches/cmake/teraterm/teraterm/ttdialog.c	2018-08-20 14:22:15 UTC (rev 7184)
+++ branches/cmake/teraterm/teraterm/ttdialog.c	2018-08-21 14:53:26 UTC (rev 7185)
@@ -31,7 +31,7 @@
 #include "teraterm.h"
 #include "tttypes.h"
 #include "ttplug.h" /* TTPLUG */
-#include "ttdlg.h"
+
 #include "ttdialog.h"
 #include "ttwinman.h"
 

Modified: branches/cmake/teraterm/ttpdlg/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpdlg/CMakeLists.txt	2018-08-20 14:22:15 UTC (rev 7184)
+++ branches/cmake/teraterm/ttpdlg/CMakeLists.txt	2018-08-21 14:53:26 UTC (rev 7185)
@@ -29,7 +29,6 @@
   ../common/teraterm.ico
   dlg_res.h
   ttdlg.c
-  ttdlg.h
   ttpdlg.def
   ttpdlg.rc
   ttpdlg-version.rc



Ttssh2-commit メーリングリストの案内