Diff of /trunk/CMakeLists.txt

OSDN > Find Software > Tera Term

 Browse Subversion Repository



/[ttssh2]/trunk/CMakeLists.txt




Diff of /trunk/CMakeLists.txt



 Parent Directory

|  Revision Log



|  Patch














revision 8571 by zmatsuo,
Tue Mar  3 15:55:02 2020 UTC




revision 8681 by zmatsuo,
Sat Apr 11 15:52:17 2020 UTC






#

Line 12 
 set(CMAKE_CONFIGURATION_TYPES "Debug;Rel


Line 12 
 set(CMAKE_CONFIGURATION_TYPES "Debug;Rel












12
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})

















13
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})

















14
 
 














 if(NOT DEFINED SNAPSHOT_DIR)
 










   string(TIMESTAMP SNAPSHOT_DIR "snapshot-%Y%m%d_%H%M%S")
 










 endif()
 










 set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/${SNAPSHOT_DIR}")
 










 
 













15
 # _WIN32_WINNT_WIN10 0x0a00
 # _WIN32_WINNT_WIN10 0x0a00

















16
 set(_WIN32_WINNT "0x0a00")
 set(_WIN32_WINNT "0x0a00")

















17
 if(MSVC)
 if(MSVC)











#

Line 113 
 configure_file(


Line 108 
 configure_file(












108
   @ONLY)
   @ONLY)

















109
 message("revision=\"${SVNVERSION}\"")
 message("revision=\"${SVNVERSION}\"")

















110
 
 















111


 ####


 ### tool













112


 


 # perl













113


 


 if (MSVC OR ("$ENV{MSYSTEM}" MATCHES "MINGW"))













114


 


   find_program(













115


 


     PERL perl.exe













116


 


     HINTS ${CMAKE_CURRENT_SOURCE_DIR}/libs/perl/perl/bin













117


 


     HINTS c:/Strawberry/perl/bin













118


 


     HINTS c:/Perl64/bin













119


 


     HINTS c:/Perl/bin













120


 


     HINTS c:/cygwin/usr/bin













121


 


     HINTS c:/cygwin64/usr/bin













122


 


     )













123


 


 else()













124


 


   set(PERL "perl")













125


 


 endif()













126


 


 message("perl=${PERL}")













127


 


 













128


 


 if(NOT $ENV{USER})













129


 


   set(USER $ENV{USER})













130


 


 elseif(NOT $ENV{USERNAME})













131


 


   set(USER $ENV{USERNAME})













132


 


 else()













133


 


   set(USER "NONAME")













134


 


 endif()













135


 


  













136


 


 if(NOT DEFINED SNAPSHOT_DIR)













137


 


   string(TIMESTAMP SNAPSHOT_DIR "snapshot-r${SVNVERSION}-%Y%m%d_%H%M%S-${USER}")













138


 


 endif()













139


 


 set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/${SNAPSHOT_DIR}")













140


 


 













141


 


 ### subdirectories













142


 


 add_subdirectory(svnrev_perl)















143
 add_subdirectory(teraterm)
 add_subdirectory(teraterm)

















144
 add_subdirectory(ttpmenu)
 add_subdirectory(ttpmenu)

















145
 add_subdirectory(TTProxy)
 add_subdirectory(TTProxy)











#

Line 124 
 if(${ENABLE_TTXSAMPLES})


Line 150 
 if(${ENABLE_TTXSAMPLES})












150
 endif()
 endif()

















151
 add_subdirectory(installer)
 add_subdirectory(installer)

















152
 add_subdirectory(doc)
 add_subdirectory(doc)














 
 










 ####
 










 # ソースツリー内に生成ファイルが存在していたら削除する
 










 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/teraterm/ttpdlg/svnversion.h")
 










   file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/teraterm/ttpdlg/svnversion.h")
 










 endif()
 










 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ttssh2/ttxssh/puttyversion.h")
 










   file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/ttssh2/ttxssh/puttyversion.h")
 










 endif()
 

























Legend:



Removed from v.8571
 


changed lines


 
Added in v.8681













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[ttssh2]/trunk/CMakeLists.txt
-revision 8571 by zmatsuo,
Tue Mar  3 15:55:02 2020 UTC
+revision 8681 by zmatsuo,
Sat Apr 11 15:52:17 2020 UTC
 Line 12 
 set(CMAKE_CONFIGURATION_TYPES "Debug;Rel
  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
- if(NOT DEFINED SNAPSHOT_DIR)
-   string(TIMESTAMP SNAPSHOT_DIR "snapshot-%Y%m%d_%H%M%S")
- endif()
- set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/${SNAPSHOT_DIR}")
  # _WIN32_WINNT_WIN10 0x0a00
  set(_WIN32_WINNT "0x0a00")
  if(MSVC)
-Line 113 
 configure_file(
+Line 108 
 configure_file(
    @ONLY)
  message("revision=\"${SVNVERSION}\"")
- ####
+ ### tool
+ # perl
+ if (MSVC OR ("$ENV{MSYSTEM}" MATCHES "MINGW"))
+   find_program(
+     PERL perl.exe
+     HINTS ${CMAKE_CURRENT_SOURCE_DIR}/libs/perl/perl/bin
+     HINTS c:/Strawberry/perl/bin
+     HINTS c:/Perl64/bin
+     HINTS c:/Perl/bin
+     HINTS c:/cygwin/usr/bin
+     HINTS c:/cygwin64/usr/bin
+     )
+ else()
+   set(PERL "perl")
+ endif()
+ message("perl=${PERL}")
+ if(NOT $ENV{USER})
+   set(USER $ENV{USER})
+ elseif(NOT $ENV{USERNAME})
+   set(USER $ENV{USERNAME})
+ else()
+   set(USER "NONAME")
+ endif()
+ if(NOT DEFINED SNAPSHOT_DIR)
+   string(TIMESTAMP SNAPSHOT_DIR "snapshot-r${SVNVERSION}-%Y%m%d_%H%M%S-${USER}")
+ endif()
+ set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/${SNAPSHOT_DIR}")
+ ### subdirectories
+ add_subdirectory(svnrev_perl)
  add_subdirectory(teraterm)
  add_subdirectory(ttpmenu)
  add_subdirectory(TTProxy)
-Line 124 
 if(${ENABLE_TTXSAMPLES})
+Line 150 
 if(${ENABLE_TTXSAMPLES})
  endif()
  add_subdirectory(installer)
  add_subdirectory(doc)
- ####
- # ソースツリー内に生成ファイルが存在していたら削除する
- if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/teraterm/ttpdlg/svnversion.h")
-   file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/teraterm/ttpdlg/svnversion.h")
- endif()
- if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ttssh2/ttxssh/puttyversion.h")
-   file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/ttssh2/ttxssh/puttyversion.h")
- endif()
 Legend:



Removed from v.8571
 


changed lines


 
Added in v.8681
 Legend:



Removed from v.8571
 


changed lines


 
Added in v.8681
-Removed from v.8571
+Added in v.8681
-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