diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-08-25 14:26:29 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-08-25 14:26:29 -0400 |
| commit | 97877202f3a00868bbd31db7f3f8e3fe4b889766 (patch) | |
| tree | 8b07a6253fad2d25620bcf4301d6a6a04d1cedd3 /indra/win_updater/CMakeLists.txt | |
| parent | ae60558141ccac3c2ca3371171015f42d50cb9cd (diff) | |
| parent | b603812fac01591951092c0ceba30277f2fb013d (diff) | |
merge changes for DRTVWR-376
Diffstat (limited to 'indra/win_updater/CMakeLists.txt')
| -rwxr-xr-x | indra/win_updater/CMakeLists.txt | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/indra/win_updater/CMakeLists.txt b/indra/win_updater/CMakeLists.txt deleted file mode 100755 index 210486c668..0000000000 --- a/indra/win_updater/CMakeLists.txt +++ /dev/null @@ -1,45 +0,0 @@ -# -*- cmake -*- - -project(win_updater) - -include(00-Common) -include(LLCommon) -include(Linking) - -# *HACK - override msvcrt implementation (intialized on 00-Common) to be -# statically linked for the installer this relies on vc taking the last flag on -# the command line -set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd") -set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT") -set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT") - -include_directories( - ${LLCOMMON_INCLUDE_DIRS} - ) - -set(win_updater_SOURCE_FILES updater.cpp) - -set(win_updater_HEADER_FILES CMakeLists.txt) - -set_source_files_properties(${win_updater_HEADER_FILES} - PROPERTIES HEADER_FILE_ONLY TRUE) - -list(APPEND win_updater_SOURCE_FILES ${win_updater_HEADER_FILES}) - -add_executable(windows-updater WIN32 ${win_updater_SOURCE_FILES}) - -target_link_libraries(windows-updater - wininet - user32 - gdi32 - shell32 - ) - -set_target_properties(windows-updater - PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:MSVCRT" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;MSVCRT\"" - ) - -# The windows-updater doesn't link against anything non-system, apparently -#ll_deploy_sharedlibs_command(windows-updater) |