CMakeList.txt bug&fix

Programmers discuss here anything related to FreeOrion programming. Primarily for the developers to discuss.

Moderator: Committer

Post Reply
Message
Author
User avatar
tezeriusz
Space Squid
Posts: 75
Joined: Mon May 24, 2010 10:22 am
Location: Poland

CMakeList.txt bug&fix

#1 Post by tezeriusz »

Hello
I just found bug in build system.
Patch below:
--------------cut here------------------
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt (wersja 3614)
+++ CMakeLists.txt (kopia robocza)
@@ -8,14 +8,14 @@
########################################
project(FreeOrion)

-set(FREEORION_VERSION 0.3.13)
+set(FREEORION_VERSION 0.3.14)
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) #wikipage info
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})


########################################
--------------cut here------------------

w/o patch full localized svn repo info is putted in to Version.cpp, so you will have compile time errors related to illegal characters.

User avatar
Geoff the Medio
Programming, Design, Admin
Posts: 13587
Joined: Wed Oct 08, 2003 1:33 am
Location: Munich

Re: CMakeList.txt bug&fix

#2 Post by Geoff the Medio »

Committed. Thanks.

User avatar
OndrejR
Space Dragon
Posts: 339
Joined: Thu Oct 02, 2008 11:00 pm
Location: Slovakia

Re: CMakeList.txt bug&fix

#3 Post by OndrejR »

In attachment there is patch fixing recent svn changes due ogdf. Needs commit.
Attachments

[The extension patch has been deactivated and can no longer be displayed.]


Post Reply