mail[Wesnoth-commits] r44110 - in /trunk: CMakeLists.txt src/CMakeLists.txt


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by koraq on July 11, 2010 - 18:50:
Author: mordante
Date: Sun Jul 11 18:50:51 2010
New Revision: 44110

URL: http://svn.gna.org/viewcvs/wesnoth?rev=44110&view=rev
Log:
ANA cmake cleanups.

- Set the option and dependency check in the top level file.
- Directy add the ana/src directoy avoiding two new options being pulled
  in.

Modified:
    trunk/CMakeLists.txt
    trunk/src/CMakeLists.txt

Modified: trunk/CMakeLists.txt
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/CMakeLists.txt?rev=44110&r1=44109&r2=44110&view=diff
==============================================================================
--- trunk/CMakeLists.txt (original)
+++ trunk/CMakeLists.txt Sun Jul 11 18:50:51 2010
@@ -80,6 +80,7 @@
 endif(UNIX AND NOT APPLE AND NOT CYGWIN)
 option(ENABLE_STRICT_COMPILATION "Sets the strict compilation mode" ON)
 option(ENABLE_DEBUG_WINDOW_LAYOUT "Add the debug option to allow the 
generation of debug layout files in dot format" OFF)
+option ( USE_ANA_NETWORK "Compile network module using ana" OFF )
 
 #misc options
 if(NOT MSVC)
@@ -220,6 +221,10 @@
        endif(ENABLE_NOTIFICATIONS)
 
 endif(ENABLE_GAME)
+
+if(USE_ANA_NETWORK)
+    find_package( Boost 1.35 REQUIRED COMPONENTS system )
+endif(USE_ANA_NETWORK)
 
 # get languages
 file(READ po/LINGUAS LINGUAS)

Modified: trunk/src/CMakeLists.txt
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/CMakeLists.txt?rev=44110&r1=44109&r2=44110&view=diff
==============================================================================
--- trunk/src/CMakeLists.txt (original)
+++ trunk/src/CMakeLists.txt Sun Jul 11 18:50:51 2010
@@ -38,14 +38,12 @@
   include_directories( ${ZLIB_INCLUDE_DIR} )
 endif()
 
-option ( USE_ANA_NETWORK "Compile network module using ana" OFF )
 
 set( network_implementation_files network.cpp network_worker.cpp )
 
 if( USE_ANA_NETWORK )
     set( network_implementation_files network_ana.cpp 
network_manager_ana.cpp)
     message( STATUS "Compiling network module with ana: 
${network_implementation_files}" )
-    find_package( Boost 1.35 REQUIRED COMPONENTS system )
 endif ( USE_ANA_NETWORK )
 
 # needed to get include paths in the subfolders correct
@@ -73,7 +71,7 @@
 endif(MSVC)
 
 if ( USE_ANA_NETWORK )
-    add_subdirectory ( ana )
+    add_subdirectory ( ana/src )
 
     set( game-external-libs
         ${common-external-libs}




Related Messages


Powered by MHonArc, Updated Sun Jul 11 19:00:08 2010