[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/marble/src
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2007-06-01 19:59:39
Message-ID: 1180727979.636982.23892.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 670512 by chehrlic:

small msvc/qt-only fixes

 M  +8 -7      CMakeLists.txt  
 M  +5 -1      lib/CMakeLists.txt  
 M  +1 -1      lib/marble_export.h  


--- trunk/KDE/kdeedu/marble/src/CMakeLists.txt #670511:670512
@@ -1,4 +1,9 @@
 
+# before add_subdirectory() !
+if(MSVC)
+  add_definitions(-D_USE_MATH_DEFINES=1)
+endif(MSVC)
+
 add_subdirectory( lib )
 
 if (QTONLY)
@@ -14,10 +19,6 @@
   include_directories (${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR}/src ${KDE4_INCLUDES})
 endif (QTONLY)
 
-if(MSVC)
-  add_definitions(-D_USE_MATH_DEFINES=1)
-endif(MSVC)
-
 set(marble_SRCS
            katlascontrol.cpp
            MarbleControlBox.cpp
@@ -78,9 +79,9 @@
     target_link_libraries(marble ${QT_PLUGINS_DIR}/imageformats/qsvg.lib)
 endif(STATIC_BUILD)
 
-if(WIN32)
+if(WIN32 AND QTONLY)
     install (TARGETS marble DESTINATION "")
-else(WIN32)
+else(WIN32 AND QTONLY)
     #set_target_properties(marble PROPERTIES VERSION 1.0.0 SOVERSION 1)
     if( NOT QTONLY)
       install (TARGETS marble DESTINATION ${BIN_INSTALL_DIR} )
@@ -94,5 +95,5 @@
     else (NOT QTONLY)
       install( FILES marble.desktop  DESTINATION share/applications)
     endif (NOT QTONLY)
-endif(WIN32)
+endif(WIN32 AND QTONLY)
 
--- trunk/KDE/kdeedu/marble/src/lib/CMakeLists.txt #670511:670512
@@ -120,7 +120,11 @@
   DEFINE_SYMBOL MAKE_MARBLE_LIB
 )
 
-install(TARGETS marblewidget DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+if(WIN32 AND QTONLY)
+  install(TARGETS marblewidget DESTINATION "")
+else(WIN32 AND QTONLY)
+  install(TARGETS marblewidget DESTINATION lib)
+endif(WIN32 AND QTONLY)
 
 ########### install files ###############
 
--- trunk/KDE/kdeedu/marble/src/lib/marble_export.h #670511:670512
@@ -11,7 +11,7 @@
 #ifndef MARBLE_EXPORT_H
 #define MARBLE_EXPORT_H
 
-#include <qglobal.h>
+#include <QtCore/qglobal.h>
 
 #ifndef MARBLE_EXPORT
 # ifdef MAKE_MARBLE_LIB
[prev in list] [next in list] [prev in thread] [next in thread]