[Avida-cvs] [avida-svn] r459 - in branches/developers/avida-edward: . CMakeModules source/bindings/Boost.Python

[kaben@myxo.css.msu.edu]

Author: kaben
Date: 2006-02-02 16:36:27 -0500 (Thu, 02 Feb 2006)
New Revision: 459

Modified:
   branches/developers/avida-edward/CMakeLists.txt
   branches/developers/avida-edward/CMakeModules/AddPysteModule.cmake
   branches/developers/avida-edward/source/bindings/Boost.Python/CMakeLists.txt
Log:

Added CMake option AVD_PY_MONOLITHIC to enable building AvidaCore python module
(when AVD_PY_MONOLITHIC is OFF, AvidaCore is built as a python package
containing lots of submodules).



Modified: branches/developers/avida-edward/CMakeLists.txt
===================================================================
--- branches/developers/avida-edward/CMakeLists.txt	2006-02-02 14:19:52 UTC (rev 458)
+++ branches/developers/avida-edward/CMakeLists.txt	2006-02-02 21:36:27 UTC (rev 459)
@@ -99,6 +99,10 @@
   "Enable Python interface to Avida. (EXPERIMENTAL)"
   OFF
 )
+OPTION(AVD_PY_MONOLITHIC
+  "Monolithic Python interface. (ignored if AVD_PY_BINDINGS is OFF)"
+  ON
+)
 IF(AVD_PY_BINDINGS)
   INCLUDE(${PROJECT_SOURCE_DIR}/CMakeModules/avdFindPython.cmake)
   AVD_FIND_PYTHON(2.4 /Library/Frameworks)

Modified: branches/developers/avida-edward/CMakeModules/AddPysteModule.cmake
===================================================================
--- branches/developers/avida-edward/CMakeModules/AddPysteModule.cmake	2006-02-02 14:19:52 UTC (rev 458)
+++ branches/developers/avida-edward/CMakeModules/AddPysteModule.cmake	2006-02-02 21:36:27 UTC (rev 459)
@@ -7,7 +7,7 @@
   SET(BOOST_PYTHON_COMPILE_FLAGS "-no-cpp-precomp -ftemplate-depth-120 -fno-inline -fPIC -Wno-long-double -Wno-long-long -DBOOST_PYTHON_DYNAMIC_LIB")
 ELSE(APPLE)
   IF(WIN32)
-    SET(BOOST_PYTHON_COMPILE_FLAGS "-Wall -ftemplate-depth-100 -DBOOST_PYTHON_STATIC_LIB  -fno-inline")
+    SET(BOOST_PYTHON_COMPILE_FLAGS "-Wall -ftemplate-depth-100 -DBOOST_PYTHON_DYNAMIC_LIB  -fno-inline")
   ELSE(WIN32)
     SET(BOOST_PYTHON_COMPILE_FLAGS "-Wall -ftemplate-depth-100  -DBOOST_PYTHON_DYNAMIC_LIB  -fno-inline -fPIC")
   ENDIF(WIN32)
@@ -25,9 +25,10 @@
   PysteBases
   Includes
   Defines
-  ExtraDepends
-  ExtraCppFiles
+  LinkLibraries
+  PackageLocation
 )
+
   #
   # A list of cpp source files to generate from pyste source files.
   #
@@ -51,11 +52,10 @@
   #
   # Command defining the python module build target.
   #
-  ADD_LIBRARY(${ModuleName} MODULE ${${ModuleName}_CppFiles} ${${ExtraCppFiles}})
+  ADD_LIBRARY(${ModuleName} MODULE ${${ModuleName}_CppFiles})
   SET_TARGET_PROPERTIES(${ModuleName} PROPERTIES PREFIX "")
-  IF(${ExtraDepends})
-    ADD_DEPENDENCIES(${ModuleName} ${${ExtraDepends}})
-  ENDIF(${ExtraDepends})
+  TARGET_LINK_LIBRARIES(${ModuleName} ${${LinkLibraries}})
+  INSTALL_TARGETS(${PackageLocation}/${ModuleName} ${ModuleName})
 
   #
   # Make a list of pyste source files to parse, and for each such file, add the parsing command that produces the
@@ -65,6 +65,7 @@
   SET(${ModuleName}_PysteCacheFiles)
   #XXX
   FOREACH(Entry ${${PysteBases}})
+#  SET(Entry "hardware_tracer::")
     STRING(REGEX REPLACE "(.*)::(.*)" "\\1" PysteBase ${Entry})
     STRING(REGEX REPLACE "(.*)::(.*)" "\\2" Args ${Entry})
     IF(Args)
@@ -129,6 +130,7 @@
         test -f ${CMAKE_CURRENT_BINARY_DIR}/${ModuleName}/_${PysteBase}.cpp
         && touch ${CMAKE_CURRENT_BINARY_DIR}/${ModuleName}/_${PysteBase}.cpp
     )
+
   ENDFOREACH(Entry ${${PysteBases}})
 
   ADD_CUSTOM_COMMAND(COMMENT "${ModuleName} main cpp source file..."
@@ -159,8 +161,6 @@
   PysteBases
   Includes
   Defines
-  ExtraDepends
-  ExtraCppFiles
   LinkLibraries
   PackageLocation
 )

Modified: branches/developers/avida-edward/source/bindings/Boost.Python/CMakeLists.txt
===================================================================
--- branches/developers/avida-edward/source/bindings/Boost.Python/CMakeLists.txt	2006-02-02 14:19:52 UTC (rev 458)
+++ branches/developers/avida-edward/source/bindings/Boost.Python/CMakeLists.txt	2006-02-02 21:36:27 UTC (rev 459)
@@ -205,16 +205,22 @@
   -I ${PROJECT_SOURCE_DIR}/source/third-party/yaktest
   -I ${CMAKE_CURRENT_SOURCE_DIR}
   -I ${BOOST_INCLUDE_PATH})
-SET(PyAvida_Defines)
-SET(PyAvida_ExtraDepends)
 SET(PyAvida_LinkLibraries PyAvidaRepairHacks ${BOOST_LIBRARY} ${PYTHON_LIBRARY})
-ADD_PYSTE_PACKAGE("AvidaCore"
-  PyAvida_Pyste_Bases
-  PyAvida_Includes
-  PyAvida_Defines
-  PyAvida_ExtraDepends
-  PyAvida_Extra_Cpp_Files
-  PyAvida_LinkLibraries
-  /lib)
 
+IF(AVD_PY_MONOLITHIC)
+	ADD_PYSTE_MODULE("AvidaCore"
+		PyAvida_Pyste_Bases
+		PyAvida_Includes
+		PyAvida_Defines
+		PyAvida_LinkLibraries
+		/lib)
+ELSE(AVD_PY_MONOLITHIC)
+	ADD_PYSTE_PACKAGE("AvidaCore"
+		PyAvida_Pyste_Bases
+		PyAvida_Includes
+		PyAvida_Defines
+		PyAvida_LinkLibraries
+		/lib)
+ENDIF(AVD_PY_MONOLITHIC)
+
 # vim: set ft=conf: