[Avida-cvs] [Avida2-svn] r255 - trunk/CMakeModules

[kaben@myxo.css.msu.edu]

Author: kaben
Date: 2005-07-22 16:25:44 -0400 (Fri, 22 Jul 2005)
New Revision: 255

Modified:
   trunk/CMakeModules/AddPysteModule.cmake
Log:

In Python module generation script CMakeModules/AddPysteModule.cmake:
- Removed compile flag "-fcoalesce-templates" (apparently unavailable in
  gcc-4);
- Fixed bogus paths to source code generated for Avida Python modules.
- Added missing '$' that was preventing installation of Avida Python
  modules.



Modified: trunk/CMakeModules/AddPysteModule.cmake
===================================================================
--- trunk/CMakeModules/AddPysteModule.cmake	2005-07-22 20:07:29 UTC (rev 254)
+++ trunk/CMakeModules/AddPysteModule.cmake	2005-07-22 20:25:44 UTC (rev 255)
@@ -5,7 +5,7 @@
 #LINK_DIRECTORIES(${PY_BOOST_LIBRARIES})
 
 IF(APPLE)
-  SET(BOOST_PYTHON_COMPILE_FLAGS "-no-cpp-precomp -ftemplate-depth-120 -fcoalesce-templates -fno-inline -fPIC -Wno-long-double -Wno-long-long -DBOOST_PYTHON_DYNAMIC_LIB")
+  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)
   SET(BOOST_PYTHON_COMPILE_FLAGS "-Wall -ftemplate-depth-100  -DBOOST_PYTHON_DYNAMIC_LIB  -fno-inline -fPIC")
 ENDIF(APPLE)
@@ -200,7 +200,7 @@
       SET(DepList)
     ENDIF(Args)
 
-    SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/${ModuleName}/_${PysteBase}.cpp
+    SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/${PysteBase}.cpp
       PROPERTIES
         GENERATED TRUE
         COMPILE_FLAGS ${BOOST_PYTHON_COMPILE_FLAGS})
@@ -253,7 +253,7 @@
     ADD_LIBRARY(${ModuleName}/${PysteBase} MODULE ${CMAKE_CURRENT_BINARY_DIR}/${PysteBase}.cpp)
     SET_TARGET_PROPERTIES(${ModuleName}/${PysteBase} PROPERTIES PREFIX "")
     TARGET_LINK_LIBRARIES(${ModuleName}/${PysteBase} ${${LinkLibraries}})
-    INSTALL_TARGETS(${PackageLocation}/${ModuleName} $${ModuleName}/{PysteBase})
+    INSTALL_TARGETS(${PackageLocation}/${ModuleName} $${ModuleName}/${PysteBase})
     FILE(APPEND ${LIBRARY_OUTPUT_PATH}/${ModuleName}/__init__.py "from ${PysteBase} import *\n")
   ENDFOREACH(Entry ${${PysteBases}})
   #FOREACH(Entry ${${PysteBases}})