Author: mordante
Date: Fri May 1 17:02:03 2009
New Revision: 35368
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35368&view=rev
Log:
Change the way the editor files are added in cmake.
The new way is the same as scons and automake. This will fix some issues
I had with the not yet committed new unittests.
Modified:
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/CMakeLists.txt?rev=35368&r1=35367&r2=35368&view=diff
==============================================================================
--- trunk/src/CMakeLists.txt (original)
+++ trunk/src/CMakeLists.txt Fri May 1 17:02:03 2009
@@ -350,7 +350,6 @@
)
# used with editor option in the wesnoth target
-IF(ENABLE_EDITOR)
SET(wesnoth-editor_SRC
gui/dialogs/editor_generate_map.cpp
@@ -370,20 +369,19 @@
editor2/mouse_action.cpp
)
+IF(ENABLE_EDITOR)
+
+SET(wesnoth-main_SRC
+ ${wesnoth-main_SRC}
+ ${wesnoth-editor_SRC}
+)
+
+ENDIF(ENABLE_EDITOR)
+
SET(wesnoth_SRC
game.cpp
${wesnoth-main_SRC}
- ${wesnoth-editor_SRC}
-)
-
-ELSE(ENABLE_EDITOR)
-
-SET(wesnoth_SRC
- game.cpp
- ${wesnoth-main_SRC}
-)
-
-ENDIF(ENABLE_EDITOR)
+)
add_executable(wesnoth ${wesnoth_SRC})
target_link_libraries(wesnoth wesnoth-core wesnoth-game ${game-external-libs})
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
