Skip to content
Snippets Groups Projects
Commit 84fe582c authored by Bryan O'Sullivan's avatar Bryan O'Sullivan
Browse files

Don't add a package target on Windows or OS X by default.

This improves build times, since most devs don't need to package stuff.

Reviewed by that fine specimen of reviewerhood, Palange.
parent 0e047070
No related branches found
No related tags found
No related merge requests found
...@@ -477,7 +477,7 @@ class WindowsSetup(PlatformSetup): ...@@ -477,7 +477,7 @@ class WindowsSetup(PlatformSetup):
print 'Found: %s' % value print 'Found: %s' % value
return value return value
except WindowsError, err: except WindowsError, err:
print >> sys.stderr, "Didn't find ", self.gens[gen]['name'] print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
return '' return ''
def get_build_cmd(self): def get_build_cmd(self):
......
...@@ -1211,6 +1211,9 @@ if (LLKDU_LIBRARY) ...@@ -1211,6 +1211,9 @@ if (LLKDU_LIBRARY)
add_dependencies(secondlife-bin ${LLKDU_LIBRARY}) add_dependencies(secondlife-bin ${LLKDU_LIBRARY})
endif (LLKDU_LIBRARY) endif (LLKDU_LIBRARY)
set(PACKAGE OFF CACHE BOOL
"Add a package target that builds an installer package.")
if (WINDOWS) if (WINDOWS)
if(MSVC71) if(MSVC71)
set(release_flags "/MAP:Release/secondlife-bin.map /MAPINFO:LINES") set(release_flags "/MAP:Release/secondlife-bin.map /MAPINFO:LINES")
...@@ -1267,7 +1270,6 @@ if (WINDOWS) ...@@ -1267,7 +1270,6 @@ if (WINDOWS)
add_dependencies(secondlife-bin copy_win_scripts) add_dependencies(secondlife-bin copy_win_scripts)
endif (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts) endif (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts)
add_custom_target(package ALL DEPENDS ${CMAKE_CFG_INTDIR}/touched.bat)
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CFG_INTDIR}/touched.bat OUTPUT ${CMAKE_CFG_INTDIR}/touched.bat
COMMAND ${PYTHON_EXECUTABLE} COMMAND ${PYTHON_EXECUTABLE}
...@@ -1282,7 +1284,10 @@ if (WINDOWS) ...@@ -1282,7 +1284,10 @@ if (WINDOWS)
--touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/touched.bat --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/touched.bat
DEPENDS secondlife-bin ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py DEPENDS secondlife-bin ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
) )
add_dependencies(package windows-updater windows-crash-logger) if (PACKAGE)
add_custom_target(package ALL DEPENDS ${CMAKE_CFG_INTDIR}/touched.bat)
add_dependencies(package windows-updater windows-crash-logger)
endif (PACKAGE)
endif (WINDOWS) endif (WINDOWS)
target_link_libraries(secondlife-bin target_link_libraries(secondlife-bin
...@@ -1421,7 +1426,9 @@ if (DARWIN) ...@@ -1421,7 +1426,9 @@ if (DARWIN)
DEPENDS secondlife-bin ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py DEPENDS secondlife-bin ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
) )
add_custom_target(package DEPENDS "${CMAKE_CFG_INTDIR}/.${product}.touched") if (PACKAGE)
add_custom_target(package DEPENDS "${CMAKE_CFG_INTDIR}/.${product}.touched")
endif (PACKAGE)
endif (DARWIN) endif (DARWIN)
if (INSTALL) if (INSTALL)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment