Diff of /trunk/ttssh2/ttxssh/CMakeLists.txt

OSDN > Find Software > Tera Term

 Browse Subversion Repository



/[ttssh2]/trunk/ttssh2/ttxssh/CMakeLists.txt




Diff of /trunk/ttssh2/ttxssh/CMakeLists.txt



 Parent Directory

|  Revision Log



|  Patch














revision 7560 by zmatsuo,
Mon Apr  8 17:12:02 2019 UTC




revision 7952 by zmatsuo,
Tue Aug 13 16:22:11 2019 UTC






#

Line 5 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CM


Line 5 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CM












5
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_zlib.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_zlib.cmake)

















6
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_openssl.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_openssl.cmake)

















7
 
 















8


 if(USE_UNICODE_API)


 if (MSVC)













9


   add_definitions(-DUNICODE -D_UNICODE)


   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DELAYLOAD:dnsapi.dll")















10
 endif()
 endif()

















11
 
 















12


 set(COMMON_SRC


 add_library(













13


   ../../teraterm/teraterm/WSAAsyncGetAddrInfo.c


   ttxssh SHARED
















   ../../teraterm/common/ttcommon.h


 
















   ../../teraterm/common/i18n.h


 
















   ../../teraterm/common/ttlib.h


 
















   ../../teraterm/common/ttlib.c


 
















   ../../teraterm/common/dlglib.h


 
















   ../../teraterm/common/dlglib.c


 
















   ../../teraterm/common/dlglib_cpp.cpp


 
















   ../../teraterm/common/dlglib_tmpl.cpp


 
















   ../../teraterm/common/servicenames.h


 
















   ../../teraterm/common/codeconv.cpp


 
















   ../../teraterm/common/codeconv.h


 
















   ../../teraterm/common/tipwin.cpp


 
















   ../../teraterm/common/tipwin.h


 
















   )


 
















 


 
















 source_group(


 
















   "common"


 
















   FILES


 
















   ${COMMON_SRC}


 















14
   )
   )

















15
 
 















16


 set(SRC


 target_sources(













17


 


   ttxssh













18


 


   PRIVATE















19
   ${CMAKE_CURRENT_BINARY_DIR}/puttyversion.h
   ${CMAKE_CURRENT_BINARY_DIR}/puttyversion.h

















20
   ../matcher/matcher.c
   ../matcher/matcher.c

















21
   arc4random.c
   arc4random.c











#

Line 98 
 set(SRC


Line 81 
 set(SRC












81
   ${COMMON_SRC}
   ${COMMON_SRC}

















82
   )
   )

















83
 
 












84
 
 target_sources(







85
 
   ttxssh







86
 
   PRIVATE







87
 
   ../../teraterm/teraterm/WSAAsyncGetAddrInfo.c







88
 
   ../../teraterm/common/ttcommon.h







89
 
   ../../teraterm/common/i18n.h







90
 
   ../../teraterm/common/ttlib.h







91
 
   ../../teraterm/common/ttlib.c







92
 
   ../../teraterm/common/dlglib.h







93
 
   ../../teraterm/common/dlglib.c







94
 
   ../../teraterm/common/dlglib_cpp.cpp







95
 
   ../../teraterm/common/dlglib_tmpl.cpp







96
 
   ../../teraterm/common/servicenames.h







97
 
   ../../teraterm/common/codeconv.cpp







98
 
   ../../teraterm/common/codeconv.h







99
 
   ../../teraterm/common/tipwin.cpp







100
 
   ../../teraterm/common/tipwin.h







101
 
   )







102
 
 







103
 
 source_group(







104
 
   "common"







105
 
   REGULAR_EXPRESSION







106
 
   "teraterm\/common\/")












107
 
 















108


 include_directories(


 target_include_directories(













109


 


   ttxssh













110


 


   PRIVATE















111
   ../../teraterm/teraterm
   ../../teraterm/teraterm

















112
   ../../teraterm/common
   ../../teraterm/common

















113
   ../matcher
   ../matcher

















114
   ../putty
   ../putty

















115
   ${OPENSSL_INCLUDE_DIRS}
   ${OPENSSL_INCLUDE_DIRS}

















116
   ${ZLIB_INCLUDE_DIRS}
   ${ZLIB_INCLUDE_DIRS}















117


   )


 )
















 


 
















 link_directories(


 
















   ${ZLIB_LIBRARY_DIRS}


 
















   )


 
















 


 
















 if (MSVC)


 
















   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DELAYLOAD:dnsapi.dll")


 
















 endif()


 
















 


 
















 add_library(


 
















   ttxssh SHARED


 
















   ${SRC}


 
















   )


 















118
 
 

















119
 set_target_properties(
 set_target_properties(

















120
   ttxssh
   ttxssh











#

Line 127 
 set_target_properties(


Line 122 
 set_target_properties(












122
   PREFIX ""
   PREFIX ""

















123
   )
   )

















124
 
 












125
 
 target_compile_definitions(







126
 
   ttxssh







127
 
   PRIVATE







128
 
   $<$<CONFIG:Debug>:_CRTDBG_MAP_ALLOC>







129
 
   )







130
 
 if(USE_UNICODE_API)







131
 
   target_compile_definitions(







132
 
     ttxssh







133
 
     PRIVATE







134
 
     UNICODE







135
 
     _UNICODE







136
 
     )







137
 
 endif()







138
 
 







139
 
 












140
 target_link_libraries(
 target_link_libraries(

















141
   ttxssh
   ttxssh

















142
   libputty
   libputty

















143
   ttpcmn
   ttpcmn















144


   debug zlibstaticd


   ${ZLIB_LIB}
















   optimized zlibstatic


 















145
   ${OPENSSL_LIB}
   ${OPENSSL_LIB}

















146
   #
   #

















147
   ws2_32
   ws2_32





























Legend:



Removed from v.7560
 


changed lines


 
Added in v.7952













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[ttssh2]/trunk/ttssh2/ttxssh/CMakeLists.txt
-revision 7560 by zmatsuo,
Mon Apr  8 17:12:02 2019 UTC
+revision 7952 by zmatsuo,
Tue Aug 13 16:22:11 2019 UTC
 Line 5 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CM
  include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_zlib.cmake)
  include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_openssl.cmake)
- if(USE_UNICODE_API)
+ if (MSVC)
-   add_definitions(-DUNICODE -D_UNICODE)
+   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DELAYLOAD:dnsapi.dll")
  endif()
- set(COMMON_SRC
+ add_library(
-   ../../teraterm/teraterm/WSAAsyncGetAddrInfo.c
+   ttxssh SHARED
-   ../../teraterm/common/ttcommon.h
-   ../../teraterm/common/i18n.h
-   ../../teraterm/common/ttlib.h
-   ../../teraterm/common/ttlib.c
-   ../../teraterm/common/dlglib.h
-   ../../teraterm/common/dlglib.c
-   ../../teraterm/common/dlglib_cpp.cpp
-   ../../teraterm/common/dlglib_tmpl.cpp
-   ../../teraterm/common/servicenames.h
-   ../../teraterm/common/codeconv.cpp
-   ../../teraterm/common/codeconv.h
-   ../../teraterm/common/tipwin.cpp
-   ../../teraterm/common/tipwin.h
-   )
- source_group(
-   "common"
-   FILES
-   ${COMMON_SRC}
    )
- set(SRC
+ target_sources(
+   ttxssh
+   PRIVATE
    ${CMAKE_CURRENT_BINARY_DIR}/puttyversion.h
    ../matcher/matcher.c
    arc4random.c
-Line 98 
 set(SRC
+Line 81 
 set(SRC
    ${COMMON_SRC}
    )
+ target_sources(
+   ttxssh
+   PRIVATE
+   ../../teraterm/teraterm/WSAAsyncGetAddrInfo.c
+   ../../teraterm/common/ttcommon.h
+   ../../teraterm/common/i18n.h
+   ../../teraterm/common/ttlib.h
+   ../../teraterm/common/ttlib.c
+   ../../teraterm/common/dlglib.h
+   ../../teraterm/common/dlglib.c
+   ../../teraterm/common/dlglib_cpp.cpp
+   ../../teraterm/common/dlglib_tmpl.cpp
+   ../../teraterm/common/servicenames.h
+   ../../teraterm/common/codeconv.cpp
+   ../../teraterm/common/codeconv.h
+   ../../teraterm/common/tipwin.cpp
+   ../../teraterm/common/tipwin.h
+   )
+ source_group(
+   "common"
+   REGULAR_EXPRESSION
+   "teraterm\/common\/")
- include_directories(
+ target_include_directories(
+   ttxssh
+   PRIVATE
    ../../teraterm/teraterm
    ../../teraterm/common
    ../matcher
    ../putty
    ${OPENSSL_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIRS}
-   )
+ )
- link_directories(
-   ${ZLIB_LIBRARY_DIRS}
-   )
- if (MSVC)
-   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DELAYLOAD:dnsapi.dll")
- endif()
- add_library(
-   ttxssh SHARED
-   ${SRC}
-   )
  set_target_properties(
    ttxssh
-Line 127 
 set_target_properties(
+Line 122 
 set_target_properties(
    PREFIX ""
    )
+ target_compile_definitions(
+   ttxssh
+   PRIVATE
+   $<$<CONFIG:Debug>:_CRTDBG_MAP_ALLOC>
+   )
+ if(USE_UNICODE_API)
+   target_compile_definitions(
+     ttxssh
+     PRIVATE
+     UNICODE
+     _UNICODE
+     )
+ endif()
  target_link_libraries(
    ttxssh
    libputty
    ttpcmn
-   debug zlibstaticd
+   ${ZLIB_LIB}
-   optimized zlibstatic
    ${OPENSSL_LIB}
    #
    ws2_32
 Legend:



Removed from v.7560
 


changed lines


 
Added in v.7952
 Legend:



Removed from v.7560
 


changed lines


 
Added in v.7952
-Removed from v.7560
+Added in v.7952
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

Develop and Download Open Source Software

Tera Term

Browse Subversion Repository