[8023] cmake の include path コンパイルオプションを修正 (Ttssh2-commit) - Tera Term

Revision: 8023
          https://osdn.net/projects/ttssh2/scm/svn/commits/8023
Author:   zmatsuo
Date:     2019-08-27 23:39:26 +0900 (Tue, 27 Aug 2019)
Log Message:
-----------
cmake の include path コンパイルオプションを修正

- Visual Studioの vcxprojと同じ include フォルダ指定に変更
- mingw の inlcude オプション考慮

Modified Paths:
--------------
    branches/unicode_buf/teraterm/teraterm/CMakeLists.txt

-------------- next part --------------
Modified: branches/unicode_buf/teraterm/teraterm/CMakeLists.txt
===================================================================

--- branches/unicode_buf/teraterm/teraterm/CMakeLists.txt	2019-08-27 14:39:11 UTC (rev 8022)
+++ branches/unicode_buf/teraterm/teraterm/CMakeLists.txt	2019-08-27 14:39:26 UTC (rev 8023)
@@ -150,13 +150,6 @@
   ../ttpmacro/fileread.cpp
   )
 
-include_directories(
-  ../common
-  ../ttpfile
-  ../ttpdlg
-  ${ONIGURUMA_INCLUDE_DIRS}
-  ${CMAKE_CURRENT_BINARY_DIR}/../ttpdlg     # for svnversion.h
-  )
 
 link_directories(
   ${ONIGURUMA_LIBRARY_DIRS}
@@ -178,6 +171,24 @@
   OUTPUT_NAME "ttermpro"
   )
 
+target_include_directories(
+  teraterm
+  PRIVATE
+  ../common
+  ../ttpfile
+  ../ttpdlg
+  ${ONIGURUMA_INCLUDE_DIRS}
+  ${CMAKE_CURRENT_BINARY_DIR}/../ttpdlg     # for svnversion.h
+  )
+
+if(MINGW)
+  target_include_directories(
+    teraterm
+    PRIVATE
+    .
+    )
+endif()
+
 target_link_libraries(
   teraterm
   ttpcmn


Tera Term

[Ttssh2-commit] [8023] cmake の include path コンパイルオプションを修正