From: <tz...@us...> - 2010-01-28 03:23:47
|
Revision: 3339 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3339&view=rev Author: tzlaine Date: 2010-01-28 03:23:41 +0000 (Thu, 28 Jan 2010) Log Message: ----------- Added *very basic* CPack-based installer code to CMake build system. Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2010-01-27 10:44:34 UTC (rev 3338) +++ trunk/FreeOrion/CMakeLists.txt 2010-01-28 03:23:41 UTC (rev 3339) @@ -6,6 +6,8 @@ ######################################## # Configuration # ######################################## +project(FreeOrion) + set(FREEORION_VERSION 0.3.13) set(FREEORION_RELEASE false) @@ -293,6 +295,14 @@ target_link_libraries(${VARIANT_EXENAME} "${dependency}") endforeach (dependency) endif () + + string(TOUPPER COMPONENT_${PROJECT_NAME} EXE_COMPONENT) + install( + TARGETS ${VARIANT_EXENAME} + RUNTIME DESTINATION . COMPONENT ${EXE_COMPONENT} + LIBRARY DESTINATION . COMPONENT ${EXE_COMPONENT} + ARCHIVE DESTINATION . COMPONENT ${EXE_COMPONENT} + ) endmacro () macro (executable_all_variants EXENAME) @@ -337,3 +347,144 @@ DEPENDS freeorion freeoriond freeorionca ) endif () + +######################################## +# Install Target # +######################################## +install( + DIRECTORY default + DESTINATION default + COMPONENT COMPONENT_FREEORION_DATA + PATTERN ".svn" EXCLUDE + PATTERN "*~" EXCLUDE +) + +install( + FILES + GiGi.dll + GiGiOgre.dll + GiGiOgrePlugin_OIS.dll + OIS.dll + OgreMain.dll + OpenAL32.dll + Plugin_OctreeSceneManager.dll + Plugin_CgProgramManager.dll + Plugin_ParticleFX.dll + RenderSystem_GL.dll + alut.dll + cg.dll + boost_date_time-vc90-mt-1_36.dll + boost_filesystem-vc90-mt-1_36.dll + boost_iostreams-vc90-mt-1_36.dll + boost_python-vc90-mt-1_36.dll + boost_regex-vc90-mt-1_36.dll + boost_serialization-vc90-mt-1_36.dll + boost_signals-vc90-mt-1_36.dll + boost_system-vc90-mt-1_36.dll + boost_thread-vc90-mt-1_36.dll + glew32.dll + jpeg.dll + libexpat.dll + libogg.dll + libpng13.dll + libvorbis.dll + libvorbisfile.dll + python26.dll + wrap_oal.dll + z.dll + zlib1.dll + OISInput.cfg + ogre_plugins.cfg + DESTINATION . + COMPONENT COMPONENT_FREEORION_RUNTIME_DEPS +) + +######################################## +# Packaging # +######################################## +set(BUILD_PACKAGING + false + CACHE BOOL + "Whether to build installer/binary package. (This is the executable installer on Win32, and an RPM/DEB/tarball on Linux." +) + +set(CPACK_PACKAGE_VERSION ${FREEORION_VERSION}) +set(CPACK_PACKAGE_VENDOR "FreeOrion Community") +set(CPACK_PACKAGE_CONTACT http://freeorion.org/forum) +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "FreeOrion is a free, open source, turn-based space empire and galactic conquest (4X) computer game being designed and built by the FreeOrion project. FreeOrion is inspired by the tradition of the Master of Orion games, but is not a clone or remake of that series or any other game.") +set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_HOME_DIRECTORY}/default/COPYING) +if (BUILD_PACKAGING) + set(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}) + set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) + set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}") + string(TOLOWER ${CPACK_PACKAGE_FILE_NAME} CPACK_PACKAGE_FILE_NAME) +endif () + +# RPM-specific settings +set(CPACK_RPM_PACKAGE_LICENSE LGPL) +set(CPACK_RPM_PACKAGE_REQUIRES) +# TODO + +# Deb-specific settings +set(CPACK_DEBIAN_PACKAGE_SECTION games) +# TODO + +if (UNIX) + set(CPACK_GENERATOR "TGZ;TBZ2") + find_program(RPMBUILD rpmbuild) + if (RPMBUILD) + list(APPEND CPACK_GENERATOR RPM) + endif () + set(RPMBUILD ${RPMBUILD} CACHE INTERNAL "") + find_program(DPKG dpkg) + if (DPKG) + list(APPEND CPACK_GENERATOR DEB) + endif () + set(DPKG ${DPKG} CACHE INTERNAL "") + set(CPACK_SOURCE_GENERATOR "TGZ;TBZ2") +elseif (WIN32) + set(CPACK_GENERATOR "NSIS") + set(CPACK_SOURCE_GENERATOR "ZIP") +endif () + +include(CPack) + +cpack_add_component( + COMPONENT_FREEORION_DATA + DISPLAY_NAME FreeOrion Data + DESCRIPTION "" + HIDDEN + REQUIRED +) + +cpack_add_component( + COMPONENT_FREEORION_RUNTIME_DEPS + DISPLAY_NAME FreeOrion Runtime Dependencies + DESCRIPTION "" + HIDDEN + REQUIRED +) + +cpack_add_component( + COMPONENT_FREEORION + DISPLAY_NAME FreeOrion Client + DESCRIPTION "" + HIDDEN + REQUIRED +) + +cpack_add_component( + COMPONENT_FREEORIOND + DISPLAY_NAME FreeOrion Server + DESCRIPTION "" + HIDDEN + REQUIRED +) + +cpack_add_component( + COMPONENT_FREEORIONCA + DISPLAY_NAME FreeOrion AI + DESCRIPTION "" + HIDDEN + REQUIRED +) |
From: <tz...@us...> - 2010-02-14 04:05:26
|
Revision: 3353 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3353&view=rev Author: tzlaine Date: 2010-02-14 04:05:19 +0000 (Sun, 14 Feb 2010) Log Message: ----------- Updated the CMake packaging/installer code to reproduce what FreeOrion_Install_Script.nsi does. Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2010-02-06 03:33:37 UTC (rev 3352) +++ trunk/FreeOrion/CMakeLists.txt 2010-02-14 04:05:19 UTC (rev 3353) @@ -416,12 +416,38 @@ if (BUILD_PACKAGING) set(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}) set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) - set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}") + if (WIN32) + set(PACKAGE_FILE_SYSTEM_NAME win32) + else () + set(PACKAGE_FILE_SYSTEM_NAME ${CPACK_SYSTEM_NAME}) + endif () + set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${PACKAGE_FILE_SYSTEM_NAME}") string(TOLOWER ${CPACK_PACKAGE_FILE_NAME} CPACK_PACKAGE_FILE_NAME) + set(CPACK_MONOLITHIC_INSTALL ON) endif () +# NSIS-specific settings +set(CPACK_NSIS_COMPRESSOR bzip2) +set(CPACK_NSIS_URL_INFO_ABOUT http://freeorion.org) +string(REPLACE "/" "\\\\" cmake_home_directory_with_native_windows_path_separators ${CMAKE_HOME_DIRECTORY}) +set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " + File \\\"${cmake_home_directory_with_native_windows_path_separators}\\\\..\\\\vcredist_x86.exe\\\" + ExecWait \\\"$INSTDIR\\\\vcredist_x86.exe /q\\\" + CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\FreeOrion.lnk\\\" \\\"$INSTDIR\\\\freeorion.exe\\\" \\\"--fullscreen 1\\\" + CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\FreeOrion windowed.lnk\\\" \\\"$INSTDIR\\\\freeorion.exe\\\" + CreateShortCut \\\"$DESKTOP\\\\FreeOrion.lnk\\\" \\\"$INSTDIR\\\\freeorion.exe\\\" \\\"--fullscreen 1\\\" + WriteIniStr \\\"$INSTDIR\\\\freeorion.url\\\" \\\"InternetShortcut\\\" \\\"URL\\\" \\\"http://freeorion.org\\\" + CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Website.lnk\\\" \\\"$INSTDIR\\\\freeorion.url\\\"" +) +set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " + Delete \\\"$SMPROGRAMS\\\\$START_MENU\\\\Website.lnk\\\" + Delete \\\"$DESKTOP\\\\FreeOrion.lnk\\\" + Delete \\\"$SMPROGRAMS\\\\$START_MENU\\\\FreeOrion.lnk\\\" + Delete \\\"$SMPROGRAMS\\\\$START_MENU\\\\FreeOrion windowed.lnk\\\"" +) + # RPM-specific settings -set(CPACK_RPM_PACKAGE_LICENSE LGPL) +set(CPACK_RPM_PACKAGE_LICENSE GPL) set(CPACK_RPM_PACKAGE_REQUIRES) # TODO |
From: <tz...@us...> - 2010-02-23 23:21:48
|
Revision: 3354 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3354&view=rev Author: tzlaine Date: 2010-02-23 23:21:41 +0000 (Tue, 23 Feb 2010) Log Message: ----------- Added CMake code to generate a Win32 SDK installer. Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2010-02-14 04:05:19 UTC (rev 3353) +++ trunk/FreeOrion/CMakeLists.txt 2010-02-23 23:21:41 UTC (rev 3354) @@ -349,57 +349,6 @@ endif () ######################################## -# Install Target # -######################################## -install( - DIRECTORY default - DESTINATION default - COMPONENT COMPONENT_FREEORION_DATA - PATTERN ".svn" EXCLUDE - PATTERN "*~" EXCLUDE -) - -install( - FILES - GiGi.dll - GiGiOgre.dll - GiGiOgrePlugin_OIS.dll - OIS.dll - OgreMain.dll - OpenAL32.dll - Plugin_OctreeSceneManager.dll - Plugin_CgProgramManager.dll - Plugin_ParticleFX.dll - RenderSystem_GL.dll - alut.dll - cg.dll - boost_date_time-vc90-mt-1_36.dll - boost_filesystem-vc90-mt-1_36.dll - boost_iostreams-vc90-mt-1_36.dll - boost_python-vc90-mt-1_36.dll - boost_regex-vc90-mt-1_36.dll - boost_serialization-vc90-mt-1_36.dll - boost_signals-vc90-mt-1_36.dll - boost_system-vc90-mt-1_36.dll - boost_thread-vc90-mt-1_36.dll - glew32.dll - jpeg.dll - libexpat.dll - libogg.dll - libpng13.dll - libvorbis.dll - libvorbisfile.dll - python26.dll - wrap_oal.dll - z.dll - zlib1.dll - OISInput.cfg - ogre_plugins.cfg - DESTINATION . - COMPONENT COMPONENT_FREEORION_RUNTIME_DEPS -) - -######################################## # Packaging # ######################################## set(BUILD_PACKAGING @@ -408,21 +357,142 @@ "Whether to build installer/binary package. (This is the executable installer on Win32, and an RPM/DEB/tarball on Linux." ) -set(CPACK_PACKAGE_VERSION ${FREEORION_VERSION}) +if (WIN32) + set(BUILD_SDK + false + CACHE BOOL + "Whether to build the Win32 SDK installer." + ) +endif () + +if (BUILD_SDK) + install( + DIRECTORY ../FreeOrion + DESTINATION . + COMPONENT COMPONENT_FREEORION_SOURCE + PATTERN "*~" EXCLUDE + ) + + install( + DIRECTORY ../Boost + DESTINATION . + COMPONENT COMPONENT_FREEORION_BUILD_FILES_BOOST + PATTERN "*~" EXCLUDE + ) + + install( + DIRECTORY ../include + DESTINATION . + COMPONENT COMPONENT_FREEORION_BUILD_FILES_INCLUDE + PATTERN "*~" EXCLUDE + ) + + install( + DIRECTORY ../lib + DESTINATION . + COMPONENT COMPONENT_FREEORION_BUILD_FILES_LIB + PATTERN "*~" EXCLUDE + ) + + install( + FILES + ../build/GG/CMakeCache.txt + DESTINATION build/GG + COMPONENT COMPONENT_FREEORION_BUILD_FILES_GIGI + ) + + install( + FILES + ../build/CMakeCache.txt + DESTINATION build + COMPONENT COMPONENT_FREEORION_BUILD_FILES_FREEORION + ) + + install( + FILES + ../README.txt + ../vcredist_x86.exe + ../cmake-2.8.0-win32-x86.exe + DESTINATION . + COMPONENT COMPONENT_FREEORION_MISC_SDK_FILES + ) +else () + install( + DIRECTORY default + DESTINATION default + COMPONENT COMPONENT_FREEORION_DATA + PATTERN ".svn" EXCLUDE + PATTERN "*~" EXCLUDE + ) + + install( + FILES + GiGi.dll + GiGiOgre.dll + GiGiOgrePlugin_OIS.dll + OIS.dll + OgreMain.dll + OpenAL32.dll + Plugin_OctreeSceneManager.dll + Plugin_CgProgramManager.dll + Plugin_ParticleFX.dll + RenderSystem_GL.dll + alut.dll + cg.dll + boost_date_time-vc90-mt-1_36.dll + boost_filesystem-vc90-mt-1_36.dll + boost_iostreams-vc90-mt-1_36.dll + boost_python-vc90-mt-1_36.dll + boost_regex-vc90-mt-1_36.dll + boost_serialization-vc90-mt-1_36.dll + boost_signals-vc90-mt-1_36.dll + boost_system-vc90-mt-1_36.dll + boost_thread-vc90-mt-1_36.dll + glew32.dll + jpeg.dll + libexpat.dll + libogg.dll + libpng13.dll + libvorbis.dll + libvorbisfile.dll + python26.dll + wrap_oal.dll + z.dll + zlib1.dll + OISInput.cfg + ogre_plugins.cfg + DESTINATION . + COMPONENT COMPONENT_FREEORION_RUNTIME_DEPS + ) +endif () + +if (BUILD_SDK) + set(CPACK_PACKAGE_VERSION "1.0") +else () + set(CPACK_PACKAGE_VERSION ${FREEORION_VERSION}) +endif () + set(CPACK_PACKAGE_VENDOR "FreeOrion Community") set(CPACK_PACKAGE_CONTACT http://freeorion.org/forum) set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "FreeOrion is a free, open source, turn-based space empire and galactic conquest (4X) computer game being designed and built by the FreeOrion project. FreeOrion is inspired by the tradition of the Master of Orion games, but is not a clone or remake of that series or any other game.") set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_HOME_DIRECTORY}/default/COPYING) if (BUILD_PACKAGING) set(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}) - set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) if (WIN32) set(PACKAGE_FILE_SYSTEM_NAME win32) else () set(PACKAGE_FILE_SYSTEM_NAME ${CPACK_SYSTEM_NAME}) endif () - set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${PACKAGE_FILE_SYSTEM_NAME}") - string(TOLOWER ${CPACK_PACKAGE_FILE_NAME} CPACK_PACKAGE_FILE_NAME) + if (BUILD_SDK) + set(CPACK_PACKAGE_NAME "FreeOrion SDK") + set(CPACK_PACKAGE_FILE_NAME "FreeOrion_Win32_SDK") + string(CONFIGURE "FreeOrion_SDK_${CPACK_PACKAGE_VERSION}" dir) + set(CPACK_PACKAGE_INSTALL_DIRECTORY ${dir}) + else () + set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) + set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${PACKAGE_FILE_SYSTEM_NAME}") + string(TOLOWER ${CPACK_PACKAGE_FILE_NAME} CPACK_PACKAGE_FILE_NAME) + endif () set(CPACK_MONOLITHIC_INSTALL ON) endif () @@ -430,22 +500,73 @@ set(CPACK_NSIS_COMPRESSOR bzip2) set(CPACK_NSIS_URL_INFO_ABOUT http://freeorion.org) string(REPLACE "/" "\\\\" cmake_home_directory_with_native_windows_path_separators ${CMAKE_HOME_DIRECTORY}) -set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " - File \\\"${cmake_home_directory_with_native_windows_path_separators}\\\\..\\\\vcredist_x86.exe\\\" - ExecWait \\\"$INSTDIR\\\\vcredist_x86.exe /q\\\" - CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\FreeOrion.lnk\\\" \\\"$INSTDIR\\\\freeorion.exe\\\" \\\"--fullscreen 1\\\" - CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\FreeOrion windowed.lnk\\\" \\\"$INSTDIR\\\\freeorion.exe\\\" - CreateShortCut \\\"$DESKTOP\\\\FreeOrion.lnk\\\" \\\"$INSTDIR\\\\freeorion.exe\\\" \\\"--fullscreen 1\\\" - WriteIniStr \\\"$INSTDIR\\\\freeorion.url\\\" \\\"InternetShortcut\\\" \\\"URL\\\" \\\"http://freeorion.org\\\" - CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Website.lnk\\\" \\\"$INSTDIR\\\\freeorion.url\\\"" -) -set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " - Delete \\\"$SMPROGRAMS\\\\$START_MENU\\\\Website.lnk\\\" - Delete \\\"$DESKTOP\\\\FreeOrion.lnk\\\" - Delete \\\"$SMPROGRAMS\\\\$START_MENU\\\\FreeOrion.lnk\\\" - Delete \\\"$SMPROGRAMS\\\\$START_MENU\\\\FreeOrion windowed.lnk\\\"" -) +if (BUILD_SDK) + string(REGEX REPLACE "/FreeOrion$" "" sdk_root ${CMAKE_HOME_DIRECTORY}) + set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " + !include \\\"WordFunc.nsh\\\" + + StrCpy $7 $INSTDIR + \\\${WordReplace} $7 \\\"\\\\\\\" \\\"/\\\" \\\"+\\\" $8 + + Rename $INSTDIR\\\\build\\\\GG\\\\CMakeCache.txt $INSTDIR\\\\build\\\\GG\\\\CMakeCache.txt.in + FileOpen $0 $INSTDIR\\\\build\\\\GG\\\\CMakeCache.txt.in r + FileOpen $5 $INSTDIR\\\\build\\\\GG\\\\CMakeCache.txt w + ClearErrors + loop1: + FileRead $0 $1 + IfErrors done1 + \\\${WordReplace} $1 \\\"${sdk_root}\\\" $8 \\\"+\\\" $2 + FileWrite $5 $2 + Goto loop1 + done1: + FileClose $0 + FileClose $5 + Delete $INSTDIR\\\\build\\\\GG\\\\CMakeCache.txt.in + + Rename $INSTDIR\\\\build\\\\CMakeCache.txt $INSTDIR\\\\build\\\\CMakeCache.txt.in + FileOpen $0 $INSTDIR\\\\build\\\\CMakeCache.txt.in r + FileOpen $5 $INSTDIR\\\\build\\\\CMakeCache.txt w + ClearErrors + loop2: + FileRead $0 $1 + IfErrors done2 + \\\${WordReplace} $1 \\\"${sdk_root}\\\" $8 \\\"+\\\" $2 + FileWrite $5 $2 + Goto loop2 + done2: + FileClose $0 + FileClose $5 + Delete $INSTDIR\\\\build\\\\CMakeCache.txt.in + + CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\FreeOrion SDK.lnk\\\" \\\"$INSTDIR\\\" + WriteIniStr \\\"$INSTDIR\\\\freeorion.url\\\" \\\"InternetShortcut\\\" \\\"URL\\\" \\\"http://freeorion.org\\\" + CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Website.lnk\\\" \\\"$INSTDIR\\\\freeorion.url\\\" + File \\\"${cmake_home_directory_with_native_windows_path_separators}\\\\..\\\\cmake-2.8.0-win32-x86.exe\\\" + ExecWait \\\"$INSTDIR\\\\cmake-2.8.0-win32-x86.exe\\\"" + ) + set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " + Delete \\\"$SMPROGRAMS\\\\$START_MENU\\\\FreeOrion SDK.lnk\\\" + Delete \\\"$SMPROGRAMS\\\\$START_MENU\\\\Website.lnk\\\"" + ) +else () + set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " + File \\\"${cmake_home_directory_with_native_windows_path_separators}\\\\..\\\\vcredist_x86.exe\\\" + ExecWait \\\"$INSTDIR\\\\vcredist_x86.exe /q\\\" + CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\FreeOrion.lnk\\\" \\\"$INSTDIR\\\\freeorion.exe\\\" \\\"--fullscreen 1\\\" + CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\FreeOrion windowed.lnk\\\" \\\"$INSTDIR\\\\freeorion.exe\\\" + CreateShortCut \\\"$DESKTOP\\\\FreeOrion.lnk\\\" \\\"$INSTDIR\\\\freeorion.exe\\\" \\\"--fullscreen 1\\\" + WriteIniStr \\\"$INSTDIR\\\\freeorion.url\\\" \\\"InternetShortcut\\\" \\\"URL\\\" \\\"http://freeorion.org\\\" + CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Website.lnk\\\" \\\"$INSTDIR\\\\freeorion.url\\\"" + ) + set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " + Delete \\\"$SMPROGRAMS\\\\$START_MENU\\\\Website.lnk\\\" + Delete \\\"$DESKTOP\\\\FreeOrion.lnk\\\" + Delete \\\"$SMPROGRAMS\\\\$START_MENU\\\\FreeOrion.lnk\\\" + Delete \\\"$SMPROGRAMS\\\\$START_MENU\\\\FreeOrion windowed.lnk\\\"" + ) +endif () + # RPM-specific settings set(CPACK_RPM_PACKAGE_LICENSE GPL) set(CPACK_RPM_PACKAGE_REQUIRES) @@ -475,42 +596,99 @@ include(CPack) -cpack_add_component( - COMPONENT_FREEORION_DATA - DISPLAY_NAME FreeOrion Data - DESCRIPTION "" - HIDDEN - REQUIRED -) +if (BUILD_SDK) + cpack_add_component( + COMPONENT_FREEORION_SOURCE + DISPLAY_NAME FreeOrion Source Code + DESCRIPTION "" + HIDDEN + REQUIRED + ) + cpack_add_component( + COMPONENT_FREEORION_BUILD_FILES_BOOST + DISPLAY_NAME FreeOrion Build Files -- Boost Directory + DESCRIPTION "" + HIDDEN + REQUIRED + ) -cpack_add_component( - COMPONENT_FREEORION_RUNTIME_DEPS - DISPLAY_NAME FreeOrion Runtime Dependencies - DESCRIPTION "" - HIDDEN - REQUIRED -) + cpack_add_component( + COMPONENT_FREEORION_BUILD_FILES_INCLUDE + DISPLAY_NAME FreeOrion Build Files -- Include Directory + DESCRIPTION "" + HIDDEN + REQUIRED + ) -cpack_add_component( - COMPONENT_FREEORION - DISPLAY_NAME FreeOrion Client - DESCRIPTION "" - HIDDEN - REQUIRED -) + cpack_add_component( + COMPONENT_FREEORION_BUILD_FILES_LIB + DISPLAY_NAME FreeOrion Build Files -- Lib Directory + DESCRIPTION "" + HIDDEN + REQUIRED + ) -cpack_add_component( - COMPONENT_FREEORIOND - DISPLAY_NAME FreeOrion Server - DESCRIPTION "" - HIDDEN - REQUIRED -) + cpack_add_component( + COMPONENT_FREEORION_BUILD_FILES_GIGI + DISPLAY_NAME FreeOrion Build Files -- Gigi CMake Cache + DESCRIPTION "" + HIDDEN + REQUIRED + ) -cpack_add_component( - COMPONENT_FREEORIONCA - DISPLAY_NAME FreeOrion AI - DESCRIPTION "" - HIDDEN - REQUIRED -) + cpack_add_component( + COMPONENT_FREEORION_BUILD_FILES_FREEORION + DISPLAY_NAME FreeOrion Build Files -- FreeOrion CMake Cache + DESCRIPTION "" + HIDDEN + REQUIRED + ) + + cpack_add_component( + COMPONENT_FREEORION_MISC_SDK_FILES + DISPLAY_NAME FreeOrion Misc SDK Files + DESCRIPTION "" + HIDDEN + REQUIRED + ) +else () + cpack_add_component( + COMPONENT_FREEORION_RUNTIME_DEPS + DISPLAY_NAME FreeOrion Runtime Dependencies + DESCRIPTION "" + HIDDEN + REQUIRED + ) + + cpack_add_component( + COMPONENT_FREEORION_DATA + DISPLAY_NAME FreeOrion Data + DESCRIPTION "" + HIDDEN + REQUIRED + ) + + cpack_add_component( + COMPONENT_FREEORION + DISPLAY_NAME FreeOrion Client + DESCRIPTION "" + HIDDEN + REQUIRED + ) + + cpack_add_component( + COMPONENT_FREEORIOND + DISPLAY_NAME FreeOrion Server + DESCRIPTION "" + HIDDEN + REQUIRED + ) + + cpack_add_component( + COMPONENT_FREEORIONCA + DISPLAY_NAME FreeOrion AI + DESCRIPTION "" + HIDDEN + REQUIRED + ) +endif () |
From: <tz...@us...> - 2010-02-24 04:05:19
|
Revision: 3355 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3355&view=rev Author: tzlaine Date: 2010-02-24 04:05:12 +0000 (Wed, 24 Feb 2010) Log Message: ----------- Wrapped the Win32 runtime dependencies from the SDK in "if (WIN32)", so that packages/installers for non-Windows platforms aren't polluted with them. Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2010-02-23 23:21:41 UTC (rev 3354) +++ trunk/FreeOrion/CMakeLists.txt 2010-02-24 04:05:12 UTC (rev 3355) @@ -425,45 +425,47 @@ PATTERN "*~" EXCLUDE ) - install( - FILES - GiGi.dll - GiGiOgre.dll - GiGiOgrePlugin_OIS.dll - OIS.dll - OgreMain.dll - OpenAL32.dll - Plugin_OctreeSceneManager.dll - Plugin_CgProgramManager.dll - Plugin_ParticleFX.dll - RenderSystem_GL.dll - alut.dll - cg.dll - boost_date_time-vc90-mt-1_36.dll - boost_filesystem-vc90-mt-1_36.dll - boost_iostreams-vc90-mt-1_36.dll - boost_python-vc90-mt-1_36.dll - boost_regex-vc90-mt-1_36.dll - boost_serialization-vc90-mt-1_36.dll - boost_signals-vc90-mt-1_36.dll - boost_system-vc90-mt-1_36.dll - boost_thread-vc90-mt-1_36.dll - glew32.dll - jpeg.dll - libexpat.dll - libogg.dll - libpng13.dll - libvorbis.dll - libvorbisfile.dll - python26.dll - wrap_oal.dll - z.dll - zlib1.dll - OISInput.cfg - ogre_plugins.cfg - DESTINATION . - COMPONENT COMPONENT_FREEORION_RUNTIME_DEPS - ) + if (WIN32) + install( + FILES + GiGi.dll + GiGiOgre.dll + GiGiOgrePlugin_OIS.dll + OIS.dll + OgreMain.dll + OpenAL32.dll + Plugin_OctreeSceneManager.dll + Plugin_CgProgramManager.dll + Plugin_ParticleFX.dll + RenderSystem_GL.dll + alut.dll + cg.dll + boost_date_time-vc90-mt-1_36.dll + boost_filesystem-vc90-mt-1_36.dll + boost_iostreams-vc90-mt-1_36.dll + boost_python-vc90-mt-1_36.dll + boost_regex-vc90-mt-1_36.dll + boost_serialization-vc90-mt-1_36.dll + boost_signals-vc90-mt-1_36.dll + boost_system-vc90-mt-1_36.dll + boost_thread-vc90-mt-1_36.dll + glew32.dll + jpeg.dll + libexpat.dll + libogg.dll + libpng13.dll + libvorbis.dll + libvorbisfile.dll + python26.dll + wrap_oal.dll + z.dll + zlib1.dll + OISInput.cfg + ogre_plugins.cfg + DESTINATION . + COMPONENT COMPONENT_FREEORION_WIN32_RUNTIME_DEPS + ) + endif () endif () if (BUILD_SDK) @@ -652,13 +654,15 @@ REQUIRED ) else () - cpack_add_component( - COMPONENT_FREEORION_RUNTIME_DEPS - DISPLAY_NAME FreeOrion Runtime Dependencies - DESCRIPTION "" - HIDDEN - REQUIRED - ) + if (WIN32) + cpack_add_component( + COMPONENT_FREEORION_WIN32_RUNTIME_DEPS + DISPLAY_NAME FreeOrion Win32 Runtime Dependencies + DESCRIPTION "" + HIDDEN + REQUIRED + ) + endif () cpack_add_component( COMPONENT_FREEORION_DATA |
From: <tz...@us...> - 2010-02-24 05:07:49
|
Revision: 3356 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3356&view=rev Author: tzlaine Date: 2010-02-24 05:07:43 +0000 (Wed, 24 Feb 2010) Log Message: ----------- Added the README file to the Start Menu links created by the SDK installer, and added a recursive delete to completely clean up the SDK install directory. Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2010-02-24 04:05:12 UTC (rev 3355) +++ trunk/FreeOrion/CMakeLists.txt 2010-02-24 05:07:43 UTC (rev 3356) @@ -478,6 +478,9 @@ set(CPACK_PACKAGE_CONTACT http://freeorion.org/forum) set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "FreeOrion is a free, open source, turn-based space empire and galactic conquest (4X) computer game being designed and built by the FreeOrion project. FreeOrion is inspired by the tradition of the Master of Orion games, but is not a clone or remake of that series or any other game.") set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_HOME_DIRECTORY}/default/COPYING) +if (BUILD_SDK) + set(CPACK_RESOURCE_FILE_README ${CMAKE_HOME_DIRECTORY}/../README.txt) +endif () if (BUILD_PACKAGING) set(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}) if (WIN32) @@ -543,13 +546,16 @@ CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\FreeOrion SDK.lnk\\\" \\\"$INSTDIR\\\" WriteIniStr \\\"$INSTDIR\\\\freeorion.url\\\" \\\"InternetShortcut\\\" \\\"URL\\\" \\\"http://freeorion.org\\\" + CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\README.lnk\\\" \\\"$INSTDIR\\\\README.txt\\\" CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Website.lnk\\\" \\\"$INSTDIR\\\\freeorion.url\\\" File \\\"${cmake_home_directory_with_native_windows_path_separators}\\\\..\\\\cmake-2.8.0-win32-x86.exe\\\" ExecWait \\\"$INSTDIR\\\\cmake-2.8.0-win32-x86.exe\\\"" ) set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " Delete \\\"$SMPROGRAMS\\\\$START_MENU\\\\FreeOrion SDK.lnk\\\" - Delete \\\"$SMPROGRAMS\\\\$START_MENU\\\\Website.lnk\\\"" + Delete \\\"$SMPROGRAMS\\\\$START_MENU\\\\README.lnk\\\" + Delete \\\"$SMPROGRAMS\\\\$START_MENU\\\\Website.lnk\\\" + RMDir /r /REBOOTOK $INSTDIR" ) else () set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " |
From: <geo...@us...> - 2010-06-03 05:05:48
|
Revision: 3615 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3615&view=rev Author: geoffthemedio Date: 2010-06-03 05:05:42 +0000 (Thu, 03 Jun 2010) Log Message: ----------- Fixes for CMakeLists.txt suggested by tezeriusz on forums. Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2010-05-29 19:33:30 UTC (rev 3614) +++ trunk/FreeOrion/CMakeLists.txt 2010-06-03 05:05:42 UTC (rev 3615) @@ -8,14 +8,14 @@ ######################################## project(FreeOrion) -set(FREEORION_VERSION 0.3.13) +set(FREEORION_VERSION 0.3.15) set(FREEORION_RELEASE false) list(APPEND CMAKE_MODULE_PATH ${CMAKE_HOME_DIRECTORY}/cmake ${CMAKE_HOME_DIRECTORY}/GG/cmake) include(Config) include(Util) -set(MINIMUM_BOOST_VERSION 1.36.0) +set(MINIMUM_BOOST_VERSION 1.42.0) set(MINIMUM_BOOST_COMPONENTS date_time filesystem serialization signals system thread) set(BOOST_SIGNALS_NAMESPACE "signals" CACHE STRING @@ -85,6 +85,8 @@ find_package(Subversion) set(svn_revision_number ???) +set(tmpLANG $ENV{LANG}) +set(ENV{LANG} "C") if (Subversion_FOUND) execute_process( COMMAND ${Subversion_SVN_EXECUTABLE} info @@ -101,6 +103,7 @@ ${CMAKE_BINARY_DIR}/util/Version.cpp @ONLY ) +set($ENV{LANG} ${tmpLANG}) ######################################## |
From: <geo...@us...> - 2010-12-06 01:43:16
|
Revision: 3871 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3871&view=rev Author: geoffthemedio Date: 2010-12-06 01:43:10 +0000 (Mon, 06 Dec 2010) Log Message: ----------- CMakeLists.txt fix by OndrejR Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2010-12-05 19:51:21 UTC (rev 3870) +++ trunk/FreeOrion/CMakeLists.txt 2010-12-06 01:43:10 UTC (rev 3871) @@ -114,6 +114,7 @@ #project(freeorion_lib) # include_directories(${CMAKE_SOURCE_DIR} log4cpp) +include_directories(${CMAKE_SOURCE_DIR} UI/ogdf) # #if (FREEORION_RELEASE) # add_definitions(-DFREEORION_RELEASE) @@ -216,7 +217,7 @@ # This macro is an internal utility macro that builds a particular variant of # an executable. # -# executable_variant(exename +# executable_variant(exename # feature1 feature2 ...) # # where exename is the name of the executable (e.g., "GiGiSDL") and feature1, |
From: <geo...@us...> - 2011-02-20 23:46:34
|
Revision: 3981 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3981&view=rev Author: geoffthemedio Date: 2011-02-20 23:46:28 +0000 (Sun, 20 Feb 2011) Log Message: ----------- Update boost file name version numbers in CMakeLists.txt to match required boost version (1.44). Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2011-02-20 23:45:39 UTC (rev 3980) +++ trunk/FreeOrion/CMakeLists.txt 2011-02-20 23:46:28 UTC (rev 3981) @@ -442,15 +442,15 @@ Plugin_ParticleFX.dll RenderSystem_GL.dll alut.dll - boost_date_time-vc90-mt-1_42.dll - boost_filesystem-vc90-mt-1_42.dll - boost_iostreams-vc90-mt-1_42.dll - boost_python-vc90-mt-1_42.dll - boost_regex-vc90-mt-1_42.dll - boost_serialization-vc90-mt-1_42.dll - boost_signals-vc90-mt-1_42.dll - boost_system-vc90-mt-1_42.dll - boost_thread-vc90-mt-1_42.dll + boost_date_time-vc90-mt-1_44.dll + boost_filesystem-vc90-mt-1_44.dll + boost_iostreams-vc90-mt-1_44.dll + boost_python-vc90-mt-1_44.dll + boost_regex-vc90-mt-1_44.dll + boost_serialization-vc90-mt-1_44.dll + boost_signals-vc90-mt-1_44.dll + boost_system-vc90-mt-1_44.dll + boost_thread-vc90-mt-1_44.dll glew32.dll jpeg.dll libexpat.dll |
From: <tz...@us...> - 2011-09-29 01:55:14
|
Revision: 4303 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4303&view=rev Author: tzlaine Date: 2011-09-29 01:55:08 +0000 (Thu, 29 Sep 2011) Log Message: ----------- Set ENV{LC_ALL} to "C" before calling "svn info" in the CMake build, so that our regex will match the returned string. Patch by cami. Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2011-09-29 01:22:18 UTC (rev 4302) +++ trunk/FreeOrion/CMakeLists.txt 2011-09-29 01:55:08 UTC (rev 4303) @@ -86,7 +86,9 @@ find_package(Subversion) set(svn_revision_number ???) set(tmpLANG $ENV{LANG}) +set(tmpLC_ALL $ENV{LC_ALL}) set(ENV{LANG} "C") +set(ENV{LC_ALL} "C") if (Subversion_FOUND) execute_process( COMMAND ${Subversion_SVN_EXECUTABLE} info @@ -104,6 +106,7 @@ @ONLY ) set($ENV{LANG} ${tmpLANG}) +set(LC_ALL $ENV{tmpLC_ALL}) ######################################## |
From: <tz...@us...> - 2011-11-08 18:36:36
|
Revision: 4480 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4480&view=rev Author: tzlaine Date: 2011-11-08 18:36:30 +0000 (Tue, 08 Nov 2011) Log Message: ----------- Fixed CMake compile for in-source builds. Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2011-11-08 17:00:30 UTC (rev 4479) +++ trunk/FreeOrion/CMakeLists.txt 2011-11-08 18:36:30 UTC (rev 4480) @@ -220,37 +220,37 @@ set(BUILD_RELEASE ON) set(THIS_LIB_SOURCES - ../parse/Lexer.cpp - ../parse/ReportParseError.cpp - ../parse/Int.cpp - ../parse/Double.cpp - ../parse/Label.cpp - ../parse/EnumParser.cpp - ../parse/IntValueRefParser.cpp - ../parse/DoubleValueRefParser.cpp - ../parse/StringValueRefParser.cpp - ../parse/PlanetSizeValueRefParser.cpp - ../parse/PlanetTypeValueRefParser.cpp - ../parse/PlanetEnvironmentValueRefParser.cpp - ../parse/UniverseObjectTypeValueRefParser.cpp - ../parse/StarTypeValueRefParser.cpp - ../parse/ConditionParser.cpp - ../parse/ConditionParser1.cpp - ../parse/ConditionParser2.cpp - ../parse/ConditionParser3.cpp - ../parse/EffectParser.cpp - ../parse/Parse.cpp - ../parse/BuildingsParser.cpp - ../parse/SpecialsParser.cpp - ../parse/SpeciesParser.cpp - ../parse/TechsParser.cpp - ../parse/ItemsParser.cpp - ../parse/ShipPartsParser.cpp - ../parse/ShipHullsParser.cpp - ../parse/ShipDesignsParser.cpp - ../parse/FleetPlansParser.cpp - ../parse/MonsterFleetPlansParser.cpp - ../parse/AlignmentsParser.cpp + parse/Lexer.cpp + parse/ReportParseError.cpp + parse/Int.cpp + parse/Double.cpp + parse/Label.cpp + parse/EnumParser.cpp + parse/IntValueRefParser.cpp + parse/DoubleValueRefParser.cpp + parse/StringValueRefParser.cpp + parse/PlanetSizeValueRefParser.cpp + parse/PlanetTypeValueRefParser.cpp + parse/PlanetEnvironmentValueRefParser.cpp + parse/UniverseObjectTypeValueRefParser.cpp + parse/StarTypeValueRefParser.cpp + parse/ConditionParser.cpp + parse/ConditionParser1.cpp + parse/ConditionParser2.cpp + parse/ConditionParser3.cpp + parse/EffectParser.cpp + parse/Parse.cpp + parse/BuildingsParser.cpp + parse/SpecialsParser.cpp + parse/SpeciesParser.cpp + parse/TechsParser.cpp + parse/ItemsParser.cpp + parse/ShipPartsParser.cpp + parse/ShipHullsParser.cpp + parse/ShipDesignsParser.cpp + parse/FleetPlansParser.cpp + parse/MonsterFleetPlansParser.cpp + parse/AlignmentsParser.cpp ) library_all_variants(parse) |
From: <geo...@us...> - 2011-12-19 20:28:28
|
Revision: 4523 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4523&view=rev Author: geoffthemedio Date: 2011-12-19 20:28:22 +0000 (Mon, 19 Dec 2011) Log Message: ----------- Patch by guini for CMakeLists.txt: version update, adding OpenGL library explicitly, tweaking default data install directory. Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2011-12-19 13:44:49 UTC (rev 4522) +++ trunk/FreeOrion/CMakeLists.txt 2011-12-19 20:28:22 UTC (rev 4523) @@ -8,7 +8,7 @@ ######################################## project(FreeOrion) -set(FREEORION_VERSION 0.3.15) +set(FREEORION_VERSION 0.3.17) set(FREEORION_RELEASE false) list(APPEND CMAKE_MODULE_PATH ${CMAKE_HOME_DIRECTORY}/cmake ${CMAKE_HOME_DIRECTORY}/GG/cmake) @@ -83,6 +83,14 @@ message(FATAL_ERROR "GiGi library not found.") endif () +find_package(OpenGL REQUIRED) +if(OPENGL_FOUND) + include_directories(${OPENGL_INCLUDE_DIR}) +else() + message(FATAL_ERROR "OpenGL library not found.") +endif() + + find_package(Subversion) set(svn_revision_number ???) set(tmpLANG $ENV{LANG}) @@ -126,7 +134,7 @@ set(BUILD_STATIC ON) set(BUILD_SHARED OFF) -set(THIS_LIB_LINK_LIBS ${GIGI_GIGI_LIBRARY} ${Boost_LIBRARIES} ${ZLIB_LIBRARIES}) +set(THIS_LIB_LINK_LIBS ${GIGI_GIGI_LIBRARY} ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${OPENGL_LIBRARIES}) set(THIS_LIB_SOURCES combat/CombatOrder.cpp @@ -478,7 +486,7 @@ else () install( DIRECTORY default - DESTINATION default + DESTINATION . COMPONENT COMPONENT_FREEORION_DATA PATTERN ".svn" EXCLUDE PATTERN "*~" EXCLUDE |
From: <geo...@us...> - 2012-07-09 10:14:29
|
Revision: 5011 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=5011&view=rev Author: geoffthemedio Date: 2012-07-09 10:14:20 +0000 (Mon, 09 Jul 2012) Log Message: ----------- Added EncyclopediaParser.cpp to CMakeLists.txt Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2012-07-09 09:25:46 UTC (rev 5010) +++ trunk/FreeOrion/CMakeLists.txt 2012-07-09 10:14:20 UTC (rev 5011) @@ -261,6 +261,7 @@ parse/FleetPlansParser.cpp parse/MonsterFleetPlansParser.cpp parse/AlignmentsParser.cpp + parse/EncyclopediaParser.cpp ) library_all_variants(parse) |
From: <geo...@us...> - 2012-09-06 18:42:57
|
Revision: 5211 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=5211&view=rev Author: geoffthemedio Date: 2012-09-06 18:42:51 +0000 (Thu, 06 Sep 2012) Log Message: ----------- CMakeLists.txt update for previous commit. Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2012-09-06 18:36:51 UTC (rev 5210) +++ trunk/FreeOrion/CMakeLists.txt 2012-09-06 18:42:51 UTC (rev 5211) @@ -247,6 +247,7 @@ parse/ConditionParser1.cpp parse/ConditionParser2.cpp parse/ConditionParser3.cpp + parse/ConditionParser4.cpp parse/EffectParser.cpp parse/EffectParser1.cpp parse/EffectParser2.cpp |
From: <geo...@us...> - 2013-04-01 09:33:05
|
Revision: 5935 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=5935&view=rev Author: geoffthemedio Date: 2013-04-01 09:32:57 +0000 (Mon, 01 Apr 2013) Log Message: ----------- More CMake cleanup by adrian_broher. Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2013-04-01 09:20:11 UTC (rev 5934) +++ trunk/FreeOrion/CMakeLists.txt 2013-04-01 09:32:57 UTC (rev 5935) @@ -316,9 +316,9 @@ endif (NOT BUILD_${ARG}) # Accumulate compile and link flags - set(THIS_VARIANT_COMPILE_FLAGS "${THIS_VARIANT_COMPILE_FLAGS} ${THIS_EXE_${ARG}_COMPILE_FLAGS} ${${ARG}_COMPILE_FLAGS}") - set(THIS_VARIANT_LINK_FLAGS "${THIS_VARIANT_LINK_FLAGS} ${THIS_EXE_${ARG}_LINK_FLAGS} ${${ARG}_LINK_FLAGS}") - set(THIS_VARIANT_LINK_LIBS ${THIS_VARIANT_LINK_LIBS} ${THIS_EXE_${ARG}_LINK_LIBS} ${${ARG}_LINK_LIBS}) + list(APPEND THIS_VARIANT_COMPILE_FLAGS ${THIS_EXE_${ARG}_COMPILE_FLAGS} ${${ARG}_COMPILE_FLAGS}) + list(APPEND THIS_VARIANT_LINK_FLAGS ${THIS_EXE_${ARG}_LINK_FLAGS} ${${ARG}_LINK_FLAGS}) + list(APPEND THIS_VARIANT_LINK_LIBS ${THIS_EXE_${ARG}_LINK_LIBS} ${${ARG}_LINK_LIBS}) endforeach (ARG ${ARGN}) # Handle feature interactions |
From: <geo...@us...> - 2013-04-07 21:05:28
|
Revision: 5963 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=5963&view=rev Author: geoffthemedio Date: 2013-04-07 21:05:16 +0000 (Sun, 07 Apr 2013) Log Message: ----------- Patch by adrian_broher removing unused and broken static build options for FreeOrion binaries. Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2013-04-07 18:36:03 UTC (rev 5962) +++ trunk/FreeOrion/CMakeLists.txt 2013-04-07 21:05:16 UTC (rev 5963) @@ -27,9 +27,6 @@ set(BUILD_RELEASE ON) endif () -set(BUILD_STATIC OFF) -set(BUILD_SHARED ON) - include(Config) include(Util) @@ -126,8 +123,6 @@ add_definitions(-DFREEORION_RELEASE) endif () -set(BUILD_STATIC_TMP ${BUILD_STATIC}) -set(BUILD_SHARED_TMP ${BUILD_SHARED}) set(BUILD_STATIC ON) set(BUILD_SHARED OFF) @@ -279,10 +274,7 @@ set(BUILD_DEBUG ${BUILD_DEBUG_TMP}) set(BUILD_RELEASE ${BUILD_RELEASE_TMP}) -set(BUILD_STATIC ${BUILD_STATIC_TMP}) -set(BUILD_SHARED ${BUILD_SHARED_TMP}) - # This macro is an internal utility macro that builds a particular variant of # an executable. # @@ -294,15 +286,17 @@ # # This macro will define a new executable target based on exename and the # specific variant name, which depends on the utility target exename. The -# compilation and linking flags for this executable are defined by -# THIS_EXE_COMPILE_FLAGS, THIS_EXE_LINK_FLAGS, THIS_EXE_LINK_LIBS, and all of -# the compile and linking flags implied by the features provided. +# linked libraries for this executable are defined by THIS_EXE_LINK_LIBS, +# and all of the compile and linking flags implied by the features provided. # # If any of the features listed conflict with this executable, no new targets # will be built. macro (executable_variant EXENAME) - set(THIS_VARIANT_COMPILE_FLAGS "${THIS_EXE_COMPILE_FLAGS}") - set(THIS_VARIANT_LINK_FLAGS "${THIS_EXE_LINK_FLAGS}") + set(BUILD_STATIC OFF) + set(BUILD_SHARED ON) + + set(THIS_VARIANT_COMPILE_FLAGS) + set(THIS_VARIANT_LINK_FLAGS) set(THIS_VARIANT_LINK_LIBS ${THIS_EXE_LINK_LIBS}) # Determine if it is okay to build this variant @@ -316,57 +310,32 @@ endif (NOT BUILD_${ARG}) # Accumulate compile and link flags - list(APPEND THIS_VARIANT_COMPILE_FLAGS ${THIS_EXE_${ARG}_COMPILE_FLAGS} ${${ARG}_COMPILE_FLAGS}) - list(APPEND THIS_VARIANT_LINK_FLAGS ${THIS_EXE_${ARG}_LINK_FLAGS} ${${ARG}_LINK_FLAGS}) - list(APPEND THIS_VARIANT_LINK_LIBS ${THIS_EXE_${ARG}_LINK_LIBS} ${${ARG}_LINK_LIBS}) + list(APPEND THIS_VARIANT_COMPILE_FLAGS ${${ARG}_COMPILE_FLAGS}) + list(APPEND THIS_VARIANT_LINK_FLAGS ${${ARG}_LINK_FLAGS}) + list(APPEND THIS_VARIANT_LINK_LIBS ${${ARG}_LINK_LIBS}) endforeach (ARG ${ARGN}) # Handle feature interactions feature_interactions(THIS_VARIANT ${ARGN}) if (THIS_VARIANT_OKAY) - if (IS_STATIC) - set(VARIANT_EXENAME ${EXENAME}_static) - else () - set(VARIANT_EXENAME ${EXENAME}) - endif () + set(VARIANT_EXENAME ${EXENAME}) - # We handle static vs. dynamic executables differently - list_contains(THIS_EXE_IS_STATIC STATIC ${ARGN}) - if (THIS_EXE_IS_STATIC) - # Add the executable itself - add_executable(${VARIANT_EXENAME} ${THIS_EXE_SOURCES}) + # Add the executable itself + add_executable(${VARIANT_EXENAME} ${THIS_EXE_SOURCES}) + # Set properties on this executable + set_target_properties(${VARIANT_EXENAME} + PROPERTIES + OUTPUT_NAME ${EXENAME} + RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR} + CLEAN_DIRECT_OUTPUT 1 + COMPILE_FLAGS "${THIS_VARIANT_COMPILE_FLAGS}" + LINK_FLAGS "${THIS_VARIANT_LINK_FLAGS}" + LABELS "${PROJECT_NAME}" + ) - # Set properties on this executable - set_target_properties(${VARIANT_EXENAME} - PROPERTIES - OUTPUT_NAME "${EXENAME}" - RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR} - CLEAN_DIRECT_OUTPUT 1 - COMPILE_FLAGS "${THIS_VARIANT_COMPILE_FLAGS}" - LINK_FLAGS "${THIS_VARIANT_LINK_FLAGS}" - LINK_SEARCH_END_STATIC true - LABELS "${PROJECT_NAME}" - ) - else (THIS_EXE_IS_STATIC) - add_executable(${VARIANT_EXENAME} ${THIS_EXE_SOURCES}) - # Set properties on this executable - set_target_properties(${VARIANT_EXENAME} - PROPERTIES - OUTPUT_NAME ${EXENAME} - RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR} - CLEAN_DIRECT_OUTPUT 1 - COMPILE_FLAGS "${THIS_VARIANT_COMPILE_FLAGS}" - LINK_FLAGS "${THIS_VARIANT_LINK_FLAGS}" - LABELS "${PROJECT_NAME}" - ) - endif (THIS_EXE_IS_STATIC) - # Link against whatever libraries this executable depends on target_link_libraries(${VARIANT_EXENAME} ${THIS_VARIANT_LINK_LIBS}) - foreach (dependency ${THIS_EXE_DEPENDS}) - target_link_libraries(${VARIANT_EXENAME} "${dependency}") - endforeach (dependency) endif () string(TOUPPER COMPONENT_${PROJECT_NAME} EXE_COMPONENT) @@ -379,8 +348,6 @@ endmacro () macro (executable_all_variants EXENAME) - executable_variant(${EXENAME} STATIC DEBUG MULTI_THREADED) - executable_variant(${EXENAME} STATIC RELEASE MULTI_THREADED) executable_variant(${EXENAME} SHARED DEBUG MULTI_THREADED) executable_variant(${EXENAME} SHARED RELEASE MULTI_THREADED) endmacro () |
From: <geo...@us...> - 2013-06-10 02:50:41
|
Revision: 6138 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=6138&view=rev Author: geoffthemedio Date: 2013-06-10 02:50:35 +0000 (Mon, 10 Jun 2013) Log Message: ----------- Small patch tweaking CMake verbosity setting. Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2013-06-10 02:47:19 UTC (rev 6137) +++ trunk/FreeOrion/CMakeLists.txt 2013-06-10 02:50:35 UTC (rev 6138) @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 2.6) cmake_policy(VERSION 2.6.4) -set(CMAKE_VERBOSE_MAKEFILE false) - list(APPEND CMAKE_MODULE_PATH ${CMAKE_HOME_DIRECTORY}/cmake ${CMAKE_HOME_DIRECTORY}/GG/cmake) ######################################## |
From: <geo...@us...> - 2013-06-26 03:05:08
|
Revision: 6197 http://sourceforge.net/p/freeorion/code/6197 Author: geoffthemedio Date: 2013-06-26 03:05:05 +0000 (Wed, 26 Jun 2013) Log Message: ----------- Small CMake patch by adrian_broher. Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2013-06-25 07:49:17 UTC (rev 6196) +++ trunk/FreeOrion/CMakeLists.txt 2013-06-26 03:05:05 UTC (rev 6197) @@ -30,6 +30,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) if (WIN32) add_definitions( |
From: <geo...@us...> - 2013-07-02 20:51:34
|
Revision: 6215 http://sourceforge.net/p/freeorion/code/6215 Author: geoffthemedio Date: 2013-07-02 20:51:32 +0000 (Tue, 02 Jul 2013) Log Message: ----------- Patch by adrian_broher fixing CMake out of source tree builds. Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2013-06-30 21:01:01 UTC (rev 6214) +++ trunk/FreeOrion/CMakeLists.txt 2013-07-02 20:51:32 UTC (rev 6215) @@ -205,6 +205,13 @@ ${CMAKE_BINARY_DIR}/util/Version.cpp ) +if (CMAKE_COMPILER_IS_GNUCXX) + set_source_files_properties( + ${CMAKE_BINARY_DIR}/util/Version.cpp + COMPILE_FLAGS -I${CMAKE_SOURCE_DIR}/util/ + ) +endif () + target_link_libraries(freeorioncommon ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} |
From: <mar...@us...> - 2013-08-11 07:56:21
|
Revision: 6324 http://sourceforge.net/p/freeorion/code/6324 Author: marcel_metz Date: 2013-08-11 07:56:19 +0000 (Sun, 11 Aug 2013) Log Message: ----------- Added ignoreable files for source package. Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2013-08-11 07:24:39 UTC (rev 6323) +++ trunk/FreeOrion/CMakeLists.txt 2013-08-11 07:56:19 UTC (rev 6324) @@ -113,7 +113,11 @@ ${CMAKE_BINARY_DIR}/util/Version.cpp ) +if("${FreeOrion_WC_REVISION}" STREQUAL "???") + set(FreeOrion_WC_REVISION "unknown") +endif () + ######################################## # Build common code library # ######################################## @@ -509,12 +513,56 @@ list(APPEND CPACK_GENERATOR DEB) endif () set(DPKG ${DPKG} CACHE INTERNAL "") - set(CPACK_SOURCE_GENERATOR "TGZ;TBZ2") elseif (WIN32) set(CPACK_GENERATOR "NSIS") +endif () + + +######################################## +# Source Packaging # +######################################## + +if (UNIX) + set(CPACK_SOURCE_GENERATOR "TGZ") +elseif (WIN32) set(CPACK_SOURCE_GENERATOR "ZIP") endif () +set(CPACK_SOURCE_IGNORE_FILES + "~$" + "\\\\.asm$" + "\\\\.bz2$" + "/CMakeCache\\\\.txt$" + "/CMakeFiles/" + "/cmake_install\\\\.cmake$" + "/CPackConfig.cmake$" + "/_CPack_Packages/" + "/CPackSourceConfig.cmake$" + "/CTestTestfile\\\\.cmake$" + "\\\\.dll$" + "\\\\.exe$" + "\\\\.exp$" + "/freeorion$" + "/freeorionca$" + "/freeoriond$" + "GG/GG/Config.h$" + "\\\\.git/" + "\\\\.gz$" + "\\\\.lib$" + "/Makefile$" + "/ogre_plugins.cfg$" + "\\\\.pc$" + "\\\\.pdb$" + "\\\\.pyc$" + "/Release/" + "\\\\.so$" + "\\\\.swp$" +) + +set(CPACK_SOURCE_PACKAGE_FILE_NAME + "${CMAKE_PROJECT_NAME}-v${FreeOrion_VERSION}-${FreeOrion_WC_REVISION}-source" +) + include(CPack) if (BUILD_SDK) |
From: <mar...@us...> - 2013-12-19 13:56:43
|
Revision: 6570 http://sourceforge.net/p/freeorion/code/6570 Author: marcel_metz Date: 2013-12-19 13:56:39 +0000 (Thu, 19 Dec 2013) Log Message: ----------- Fixup zlib include path. Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2013-12-18 02:26:25 UTC (rev 6569) +++ trunk/FreeOrion/CMakeLists.txt 2013-12-19 13:56:39 UTC (rev 6570) @@ -89,7 +89,7 @@ include_directories( ${Boost_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIR}i + ${ZLIB_INCLUDE_DIR} ${CMAKE_SOURCE_DIR} GG log4cpp |
From: <mar...@us...> - 2013-12-23 08:41:06
|
Revision: 6580 http://sourceforge.net/p/freeorion/code/6580 Author: marcel_metz Date: 2013-12-23 08:41:03 +0000 (Mon, 23 Dec 2013) Log Message: ----------- Disable default CMake RelWithDebInfo and MinSizeRel build modes. Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2013-12-22 21:27:50 UTC (rev 6579) +++ trunk/FreeOrion/CMakeLists.txt 2013-12-23 08:41:03 UTC (rev 6580) @@ -2,6 +2,7 @@ cmake_policy(VERSION 2.6.4) list(APPEND CMAKE_MODULE_PATH ${CMAKE_HOME_DIRECTORY}/cmake ${CMAKE_HOME_DIRECTORY}/GG/cmake) +set(CMAKE_CONFIGURATION_TYPES Debug Release) ######################################## # Configuration # |
From: <nag...@us...> - 2014-01-28 16:18:42
|
Revision: 6766 http://sourceforge.net/p/freeorion/code/6766 Author: nagilum23 Date: 2014-01-28 16:18:38 +0000 (Tue, 28 Jan 2014) Log Message: ----------- add FreeBSD to supported OS list Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2014-01-28 09:29:13 UTC (rev 6765) +++ trunk/FreeOrion/CMakeLists.txt 2014-01-28 16:18:38 UTC (rev 6766) @@ -54,6 +54,12 @@ -DENABLE_BINRELOC ) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Wno-parentheses") +elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + add_definitions( + -DFREEORION_FREEBSD + -DENABLE_BINRELOC + ) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Wno-parentheses") else () message(FATAL_ERROR "Unknown platform type! Your setup is not a supported platform for FreeOrion.") endif () |
From: <mar...@us...> - 2014-01-31 21:29:18
|
Revision: 6785 http://sourceforge.net/p/freeorion/code/6785 Author: marcel_metz Date: 2014-01-31 21:29:15 +0000 (Fri, 31 Jan 2014) Log Message: ----------- Removed superfluous copy commands for packaging with cmake. Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2014-01-31 21:22:53 UTC (rev 6784) +++ trunk/FreeOrion/CMakeLists.txt 2014-01-31 21:29:15 UTC (rev 6785) @@ -88,6 +88,12 @@ set(FreeOrion_WC_REVISION "unknown") endif () +if (WIN32) + # Add icon resource file to freeorion.exe + if (NOT EXISTS ${CMAKE_BINARY_DIR}/win32_resources.rc) + file(WRITE ${CMAKE_BINARY_DIR}/win32_resources.rc "IDI_ICON ICON \"${CMAKE_SOURCE_DIR}/FreeOrion.ico\"") + endif () +endif () ######################################## # Build common code library # @@ -311,31 +317,6 @@ add_subdirectory(client/human) ######################################## -# Win32 SDK-only steps # -######################################## -if (WIN32) - # Add icon resource file to freeorion.exe - if (NOT EXISTS ${CMAKE_BINARY_DIR}/win32_resources.rc) - file(WRITE ${CMAKE_BINARY_DIR}/win32_resources.rc "IDI_ICON ICON \"${CMAKE_SOURCE_DIR}/FreeOrion.ico\"") - endif () - - get_target_property(freeorion_loc freeorion LOCATION) - get_target_property(freeoriond_loc freeoriond LOCATION) - get_target_property(freeorionca_loc freeorionca LOCATION) - add_custom_target( - COPY_BINARIES - ALL - ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/../bin/GiGi.dll ${CMAKE_HOME_DIRECTORY}/../FreeOrion/GiGi.dll - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/../bin/GiGiOgre.dll ${CMAKE_HOME_DIRECTORY}/../FreeOrion/GiGiOgre.dll - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/../bin/GiGiOgrePlugin_OIS.dll ${CMAKE_HOME_DIRECTORY}/../FreeOrion/GiGiOgrePlugin_OIS.dll - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${freeorion_loc} ${CMAKE_HOME_DIRECTORY}/../FreeOrion/freeorion.exe - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${freeorionca_loc} ${CMAKE_HOME_DIRECTORY}/../FreeOrion/freeorionca.exe - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${freeoriond_loc} ${CMAKE_HOME_DIRECTORY}/../FreeOrion/freeoriond.exe - DEPENDS freeorion freeoriond freeorionca - ) -endif () - -######################################## # Packaging # ######################################## set(BUILD_PACKAGING |
From: <mar...@us...> - 2014-02-01 10:00:59
|
Revision: 6789 http://sourceforge.net/p/freeorion/code/6789 Author: marcel_metz Date: 2014-02-01 10:00:56 +0000 (Sat, 01 Feb 2014) Log Message: ----------- Allow CMAKE to determine RPATH for locating private libraries in an installation. Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2014-02-01 10:00:45 UTC (rev 6788) +++ trunk/FreeOrion/CMakeLists.txt 2014-02-01 10:00:56 UTC (rev 6789) @@ -26,6 +26,11 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +set(CMAKE_SKIP_BUILD_RPATH FALSE) +set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) +set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/freeorion") +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + if (WIN32) add_definitions( -D_CRT_SECURE_NO_DEPRECATE |
From: <nag...@us...> - 2014-06-09 18:32:52
|
Revision: 7147 http://sourceforge.net/p/freeorion/code/7147 Author: nagilum23 Date: 2014-06-09 18:32:44 +0000 (Mon, 09 Jun 2014) Log Message: ----------- fix the only compile error on FreeBSD when using gcc(tested with v4.9.1), still not working with clang i(for other reasons :( Modified Paths: -------------- trunk/FreeOrion/CMakeLists.txt Modified: trunk/FreeOrion/CMakeLists.txt =================================================================== --- trunk/FreeOrion/CMakeLists.txt 2014-06-08 15:32:23 UTC (rev 7146) +++ trunk/FreeOrion/CMakeLists.txt 2014-06-09 18:32:44 UTC (rev 7147) @@ -63,6 +63,7 @@ add_definitions( -DFREEORION_FREEBSD -DENABLE_BINRELOC + -DBOOST_DATE_TIME_NO_LOCALE ) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Wno-parentheses") else () |