certi-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[certi-cvs] applications/PyHLA/hla _omt/CMakeLists.txt _rti...


From: certi-cvs
Subject: [certi-cvs] applications/PyHLA/hla _omt/CMakeLists.txt _rti...
Date: Sat, 04 Jul 2009 14:10:12 +0000

CVSROOT:        /sources/certi
Module name:    applications
Changes by:     Petr Gotthard <gotthardp>       09/07/04 14:10:11

Modified files:
        PyHLA/hla/_omt : CMakeLists.txt 
        PyHLA/hla/_rti : CMakeLists.txt 

Log message:
        Better support for Visual Studio debugging

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/hla/_omt/CMakeLists.txt?cvsroot=certi&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/hla/_rti/CMakeLists.txt?cvsroot=certi&r1=1.4&r2=1.5

Patches:
Index: _omt/CMakeLists.txt
===================================================================
RCS file: /sources/certi/applications/PyHLA/hla/_omt/CMakeLists.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- _omt/CMakeLists.txt 15 Nov 2008 14:32:25 -0000      1.3
+++ _omt/CMakeLists.txt 4 Jul 2009 14:10:10 -0000       1.4
@@ -6,23 +6,29 @@
     module.h
     module.cpp)
 
+IF(NOT PYTHON_DEBUG_LIBRARY)
+    SET(PYTHON_DEBUG_LIBRARY ${PYTHON_LIBRARY})
+    SET(PYTHON_LIBRARIES ${PYTHON_LIBRARY})
+ELSE()
+    SET(PYTHON_LIBRARIES
+        optimized ${PYTHON_LIBRARY}
+        debug ${PYTHON_DEBUG_LIBRARY}
+    )
+ENDIF()
+
+TARGET_LINK_LIBRARIES(_omt
+    ${PYTHON_LIBRARIES}
+)
+
+SET_TARGET_PROPERTIES(_omt PROPERTIES DEBUG_OUTPUT_NAME "_omt_d")
 SET_TARGET_PROPERTIES(_omt PROPERTIES PREFIX "")
 IF (WIN32)
 SET_TARGET_PROPERTIES(_omt PROPERTIES SUFFIX ".pyd")
 ENDIF (WIN32)
 
-IF (CMAKE_BUILD_TYPE MATCHES Debug)
-    TARGET_LINK_LIBRARIES(_omt
-        ${PYTHON_DEBUG_LIBRARY})
-    SET_TARGET_PROPERTIES(_omt PROPERTIES OUTPUT_NAME "_omt_d")
-ELSE (CMAKE_BUILD_TYPE MATCHES Debug)
-    TARGET_LINK_LIBRARIES(_omt
-        ${PYTHON_LIBRARY})
-ENDIF (CMAKE_BUILD_TYPE MATCHES Debug)
-
 INSTALL(TARGETS _omt
     RUNTIME DESTINATION hla
     LIBRARY DESTINATION hla
     ARCHIVE DESTINATION hla)
 
-# $Id: CMakeLists.txt,v 1.3 2008/11/15 14:32:25 gotthardp Exp $
+# $Id: CMakeLists.txt,v 1.4 2009/07/04 14:10:10 gotthardp Exp $

Index: _rti/CMakeLists.txt
===================================================================
RCS file: /sources/certi/applications/PyHLA/hla/_rti/CMakeLists.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- _rti/CMakeLists.txt 21 Jun 2009 11:26:39 -0000      1.4
+++ _rti/CMakeLists.txt 4 Jul 2009 14:10:11 -0000       1.5
@@ -17,25 +17,30 @@
     module.h
     module.cpp)
 
+IF(NOT PYTHON_DEBUG_LIBRARY)
+    SET(PYTHON_DEBUG_LIBRARY ${PYTHON_LIBRARY})
+    SET(PYTHON_LIBRARIES ${PYTHON_LIBRARY})
+ELSE()
+    SET(PYTHON_LIBRARIES
+        optimized ${PYTHON_LIBRARY}
+        debug ${PYTHON_DEBUG_LIBRARY}
+    )
+ENDIF()
+
+TARGET_LINK_LIBRARIES(_rti
+    ${PYTHON_LIBRARIES}
+    ${RTI_LIBRARIES}
+)
+
+SET_TARGET_PROPERTIES(_rti PROPERTIES DEBUG_OUTPUT_NAME "_rti_d")
 SET_TARGET_PROPERTIES(_rti PROPERTIES PREFIX "")
 IF (WIN32)
 SET_TARGET_PROPERTIES(_rti PROPERTIES SUFFIX ".pyd")
 ENDIF (WIN32)
 
-IF (CMAKE_BUILD_TYPE MATCHES Debug)
-    TARGET_LINK_LIBRARIES(_rti
-        ${PYTHON_DEBUG_LIBRARY}
-        ${RTI_LIBRARIES})
-    SET_TARGET_PROPERTIES(_rti PROPERTIES OUTPUT_NAME "_rti_d")
-ELSE (CMAKE_BUILD_TYPE MATCHES Debug)
-    TARGET_LINK_LIBRARIES(_rti
-        ${PYTHON_LIBRARY}
-        ${RTI_LIBRARIES})
-ENDIF (CMAKE_BUILD_TYPE MATCHES Debug)
-
 INSTALL(TARGETS _rti
     RUNTIME DESTINATION hla
     LIBRARY DESTINATION hla
     ARCHIVE DESTINATION hla)
 
-# $Id: CMakeLists.txt,v 1.4 2009/06/21 11:26:39 gotthardp Exp $
+# $Id: CMakeLists.txt,v 1.5 2009/07/04 14:10:11 gotthardp Exp $




reply via email to

[Prev in Thread] Current Thread [Next in Thread]