From a5d98eca47028385be2e53a2cacd5b2740b3c6e8 Mon Sep 17 00:00:00 2001
From: Damien Dupuis <alliance-users@asim.lip6.fr>
Date: Thu, 15 Jul 2010 11:15:47 +0000
Subject: [PATCH]     CMakeLists cleaning : -D__PYTHON_MODULE__=1 is absolutely
 not needed when using boost::python (it is specific to isobar)

---
 vlsisapd/CMakeLists.txt                   | 1 -
 vlsisapd/src/agds/src/CMakeLists.txt      | 5 ++---
 vlsisapd/src/cif/src/CMakeLists.txt       | 5 ++---
 vlsisapd/src/dtr/src/CMakeLists.txt       | 5 ++---
 vlsisapd/src/openChams/src/CMakeLists.txt | 5 ++---
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/vlsisapd/CMakeLists.txt b/vlsisapd/CMakeLists.txt
index ce7eea11..db056b97 100644
--- a/vlsisapd/CMakeLists.txt
+++ b/vlsisapd/CMakeLists.txt
@@ -26,7 +26,6 @@ find_package(Bootstrap REQUIRED)
 setup_boost(program_options filesystem python)
 
 FIND_PACKAGE(LibXml2 REQUIRED)
-FIND_PACKAGE(PythonLibs REQUIRED)
 FIND_PACKAGE(PythonSitePackages REQUIRED)
 FIND_PACKAGE(PythonLibs REQUIRED)
 
diff --git a/vlsisapd/src/agds/src/CMakeLists.txt b/vlsisapd/src/agds/src/CMakeLists.txt
index 16c2cc78..35c22a82 100644
--- a/vlsisapd/src/agds/src/CMakeLists.txt
+++ b/vlsisapd/src/agds/src/CMakeLists.txt
@@ -20,9 +20,8 @@ INSTALL(FILES ${hpps} DESTINATION include/vlsisapd/agds)
 IF(Boost_FOUND)
   ADD_LIBRARY(pyAGDS MODULE ${pycpps})
   SET_TARGET_PROPERTIES(pyAGDS PROPERTIES
-                               COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1"
-                               OUTPUT_NAME   "AGDS"
-                               PREFIX        ""
+                               OUTPUT_NAME "AGDS"
+                               PREFIX      ""
                        )
   TARGET_LINK_LIBRARIES(pyAGDS agds ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
   INSTALL(TARGETS pyAGDS DESTINATION ${PYTHON_SITE_PACKAGES})
diff --git a/vlsisapd/src/cif/src/CMakeLists.txt b/vlsisapd/src/cif/src/CMakeLists.txt
index 2ea64b79..f8fa9d19 100644
--- a/vlsisapd/src/cif/src/CMakeLists.txt
+++ b/vlsisapd/src/cif/src/CMakeLists.txt
@@ -17,9 +17,8 @@ INSTALL(FILES ${hpps} DESTINATION include/vlsisapd/cif)
 IF(Boost_FOUND)
   ADD_LIBRARY(pyCIF MODULE ${pycpps})
   SET_TARGET_PROPERTIES(pyCIF PROPERTIES
-                              COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1"
-                              OUTPUT_NAME   "CIF"
-                              PREFIX        ""
+                              OUTPUT_NAME "CIF"
+                              PREFIX      ""
                        )
   TARGET_LINK_LIBRARIES(pyCIF cif ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
   INSTALL(TARGETS pyCIF DESTINATION ${PYTHON_SITE_PACKAGES})
diff --git a/vlsisapd/src/dtr/src/CMakeLists.txt b/vlsisapd/src/dtr/src/CMakeLists.txt
index bd552668..764308ec 100644
--- a/vlsisapd/src/dtr/src/CMakeLists.txt
+++ b/vlsisapd/src/dtr/src/CMakeLists.txt
@@ -20,9 +20,8 @@ INSTALL(TARGETS dtr DESTINATION lib${LIB_SUFFIX})
 IF (Boost_FOUND)
     ADD_LIBRARY(pyDTR MODULE ${pycpps})
     SET_TARGET_PROPERTIES(pyDTR PROPERTIES
-                          COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1"
-                          OUTPUT_NAME   "DTR"
-                          PREFIX        ""
+                                OUTPUT_NAME "DTR"
+                                PREFIX      ""
                           )
     TARGET_LINK_LIBRARIES(pyDTR dtr ${LIBXML2_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
     INSTALL(TARGETS pyDTR   DESTINATION ${PYTHON_SITE_PACKAGES})
diff --git a/vlsisapd/src/openChams/src/CMakeLists.txt b/vlsisapd/src/openChams/src/CMakeLists.txt
index b9529452..db8d275f 100644
--- a/vlsisapd/src/openChams/src/CMakeLists.txt
+++ b/vlsisapd/src/openChams/src/CMakeLists.txt
@@ -35,9 +35,8 @@ INSTALL(TARGETS openChams DESTINATION lib${LIB_SUFFIX} )
 IF(Boost_FOUND)
     ADD_LIBRARY(pyOPENCHAMS MODULE ${pycpps})
     SET_TARGET_PROPERTIES(pyOPENCHAMS PROPERTIES
-                                      COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1"
-                                      OUTPUT_NAME   "OPENCHAMS"
-                                      PREFIX        ""
+                                      OUTPUT_NAME "OPENCHAMS"
+                                      PREFIX      ""
                          )
     TARGET_LINK_LIBRARIES(pyOPENCHAMS openChams ${LIBXML2_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
     INSTALL(TARGETS pyOPENCHAMS DESTINATION ${PYTHON_SITE_PACKAGES})