removed CMP0005 policy

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7467 90c681e8-e032-0410-971d-27865f9a5e38

11 files changed, 12 insertions, 59 deletions

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 083ecf63f..e9189d18b 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -1,10 +1,5 @@
 project(app)
 
-
-if(COMMAND cmake_policy)
-   cmake_policy(SET CMP0005 OLD)
-endif(COMMAND cmake_policy) 
-
 SET(QT_USE_QTNETWORK TRUE)
 
 INCLUDE(UsePkgConfig)
diff --git a/src/plugins/Input/archive/CMakeLists.txt b/src/plugins/Input/archive/CMakeLists.txt
index 7d1f7f026..07c320cd3 100644
--- a/src/plugins/Input/archive/CMakeLists.txt
+++ b/src/plugins/Input/archive/CMakeLists.txt
@@ -1,10 +1,5 @@
 project(libarchive)
 
-
-if(COMMAND cmake_policy)
-    cmake_policy(SET CMP0005 NEW)
-endif(COMMAND cmake_policy) 
-
 # qt plugin
 ADD_DEFINITIONS( -Wall )
 ADD_DEFINITIONS(${QT_DEFINITIONS})
diff --git a/src/plugins/Input/cdaudio/CMakeLists.txt b/src/plugins/Input/cdaudio/CMakeLists.txt
index c55ef6361..6c16db534 100644
--- a/src/plugins/Input/cdaudio/CMakeLists.txt
+++ b/src/plugins/Input/cdaudio/CMakeLists.txt
@@ -1,10 +1,5 @@
 project(libcdaudio)
 
-
-if(COMMAND cmake_policy)
-    cmake_policy(SET CMP0005 NEW)
-endif(COMMAND cmake_policy) 
-
 # qt plugin
 ADD_DEFINITIONS( -Wall )
 ADD_DEFINITIONS(${QT_DEFINITIONS})
diff --git a/src/plugins/Input/mad/CMakeLists.txt b/src/plugins/Input/mad/CMakeLists.txt
index cc87b8658..65c04ae49 100644
--- a/src/plugins/Input/mad/CMakeLists.txt
+++ b/src/plugins/Input/mad/CMakeLists.txt
@@ -1,10 +1,5 @@
 project(libmad)
 
-
-if(COMMAND cmake_policy)
-    cmake_policy(SET CMP0005 NEW)
-endif(COMMAND cmake_policy) 
-
 # qt plugin
 ADD_DEFINITIONS( -Wall )
 ADD_DEFINITIONS(${QT_DEFINITIONS})
diff --git a/src/plugins/Input/wildmidi/CMakeLists.txt b/src/plugins/Input/wildmidi/CMakeLists.txt
index f6e4ac67f..7979334a7 100644
--- a/src/plugins/Input/wildmidi/CMakeLists.txt
+++ b/src/plugins/Input/wildmidi/CMakeLists.txt
@@ -1,10 +1,5 @@
 project(libwildmidi)
 
-
-if(COMMAND cmake_policy)
-    cmake_policy(SET CMP0005 NEW)
-endif(COMMAND cmake_policy)
-
 INCLUDE(CheckIncludeFile)
 
 # qt plugin
diff --git a/src/plugins/Transports/http/CMakeLists.txt b/src/plugins/Transports/http/CMakeLists.txt
index 26becefda..efd40d1e4 100644
--- a/src/plugins/Transports/http/CMakeLists.txt
+++ b/src/plugins/Transports/http/CMakeLists.txt
@@ -1,10 +1,5 @@
 project(libhttp)
 
-
-if(COMMAND cmake_policy)
-    cmake_policy(SET CMP0005 NEW)
-endif(COMMAND cmake_policy) 
-
 # qt plugin
 ADD_DEFINITIONS( -Wall )
 ADD_DEFINITIONS(${QT_DEFINITIONS})
diff --git a/src/plugins/Transports/mms/CMakeLists.txt b/src/plugins/Transports/mms/CMakeLists.txt
index 9f7c0783d..106c2f796 100644
--- a/src/plugins/Transports/mms/CMakeLists.txt
+++ b/src/plugins/Transports/mms/CMakeLists.txt
@@ -1,10 +1,5 @@
 project(libmms)
 
-
-if(COMMAND cmake_policy)
-    cmake_policy(SET CMP0005 NEW)
-endif(COMMAND cmake_policy)
-
 # qt plugin
 ADD_DEFINITIONS( -Wall )
 ADD_DEFINITIONS(${QT_DEFINITIONS})
diff --git a/src/plugins/Ui/qsui/CMakeLists.txt b/src/plugins/Ui/qsui/CMakeLists.txt
index beb438c59..a0a3c9bd7 100644
--- a/src/plugins/Ui/qsui/CMakeLists.txt
+++ b/src/plugins/Ui/qsui/CMakeLists.txt
@@ -1,10 +1,5 @@
 project(libqsui)
 
-
-if(COMMAND cmake_policy)
-    cmake_policy(SET CMP0005 OLD)
-endif(COMMAND cmake_policy)
-
 # qt plugin
 ADD_DEFINITIONS( -Wall )
 ADD_DEFINITIONS(${QT_DEFINITIONS})
diff --git a/src/plugins/Visual/projectm/CMakeLists.txt b/src/plugins/Visual/projectm/CMakeLists.txt
index 4d6b0f8af..db3446709 100644
--- a/src/plugins/Visual/projectm/CMakeLists.txt
+++ b/src/plugins/Visual/projectm/CMakeLists.txt
@@ -1,14 +1,9 @@
 project(libprojectm)
 
-
 SET (QT_USE_QTOPENGL TRUE)
 INCLUDE(FindQt4)
 include(${QT_USE_FILE})
 
-if(COMMAND cmake_policy)
-  cmake_policy(SET CMP0005 OLD)
-endif(COMMAND cmake_policy)
-
 # qt plugin
 ADD_DEFINITIONS( -Wall )
 ADD_DEFINITIONS(${QT_DEFINITIONS})
@@ -41,7 +36,7 @@ find_file(PROJECTM_CONFIG config.inp
           PATHS "/usr/share/projectM/" "/usr/local/share/projectM/")
 
 IF(PROJECTM_CONFIG)
-ADD_DEFINITIONS(-DPROJECTM_CONFIG=\\\"${PROJECTM_CONFIG}\\\")
+SET(libprojecm_DEFINES PROJECTM_CONFIG=\"${PROJECTM_CONFIG}\")
 MESSAGE(STATUS "Found projectM configuration: ${PROJECTM_CONFIG}")
 ENDIF(PROJECTM_CONFIG)
 
@@ -61,6 +56,7 @@ QT4_ADD_RESOURCES(libprojectm_RCC_SRCS ${libprojectm_RCCS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 IF(PROJECTM_FOUND)
 ADD_LIBRARY(projectm MODULE ${libprojectm_SRCS} ${libprojectm_RCC_SRCS})
+SET_TARGET_PROPERTIES(projectm PROPERTIES COMPILE_DEFINITIONS "${libprojectm_DEFINES}")
 add_dependencies(projectm qmmp)
 target_link_libraries(projectm ${QT_LIBRARIES} libqmmp ${PROJECTM_LDFLAGS} -lGL)
 install(TARGETS projectm DESTINATION ${LIB_DIR}/qmmp/Visual)
diff --git a/src/qmmp/CMakeLists.txt b/src/qmmp/CMakeLists.txt
index 142bbe18b..8254ea9ab 100644
--- a/src/qmmp/CMakeLists.txt
+++ b/src/qmmp/CMakeLists.txt
@@ -1,18 +1,17 @@
 project(libqmmp)
 
-
-if(COMMAND cmake_policy)
-    cmake_policy(SET CMP0005 OLD)
-endif(COMMAND cmake_policy)
-
 # qt lib
 ADD_DEFINITIONS( -Wall )
 ADD_DEFINITIONS(${QT_DEFINITIONS})
 ADD_DEFINITIONS(-DQT_NO_DEBUG)
 ADD_DEFINITIONS(-DQT_SHARED)
 ADD_DEFINITIONS(-DQT_THREAD)
-ADD_DEFINITIONS(-DLIB_DIR=\\\"/${LIB_DIR}\\\")
-ADD_DEFINITIONS(-DQMMP_INSTALL_PREFIX=\\\"${CMAKE_INSTALL_PREFIX}\\\")
+
+SET(libqmmp_DEFINES
+    LIB_DIR="/${LIB_DIR}"
+    QMMP_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"
+)
+
 
 IF(NOT QMMP_VERSION_STABLE) #add svn revision
 execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/svn_revision.sh
@@ -20,7 +19,7 @@ execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/svn_revision.sh
                 OUTPUT_VARIABLE SVN_REVISION
                 OUTPUT_STRIP_TRAILING_WHITESPACE)
 IF(SVN_REVISION)
-ADD_DEFINITIONS(-DSVN_REVISION=\\\"${SVN_REVISION}\\\")
+SET(libqmmp_DEFINES ${libqmmp_DEFINES} SVN_REVISION="${SVN_REVISION}") 
 ENDIF(SVN_REVISION)
 ENDIF(NOT QMMP_VERSION_STABLE)
 
@@ -29,11 +28,12 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 SET(QMMP_DEFAULT_OUTPUT "" CACHE STRING "default output plugin")
 IF(QMMP_DEFAULT_OUTPUT)
-    ADD_DEFINITIONS(-DQMMP_DEFAULT_OUTPUT=\\\"${QMMP_DEFAULT_OUTPUT}\\\")
+    SET(libqmmp_DEFINES ${libqmmp_DEFINES} QMMP_DEFAULT_OUTPUT="${QMMP_DEFAULT_OUTPUT}") 
     MESSAGE(STATUS "Default output: ${QMMP_DEFAULT_OUTPUT}")
 ENDIF(QMMP_DEFAULT_OUTPUT)
 
 
+
 SET(libqmmp_SRCS
     visual.cpp
     recycler.cpp
@@ -137,6 +137,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 ADD_LIBRARY(libqmmp SHARED ${libqmmp_SRCS} ${libqmmp_HDRS})
 target_link_libraries(libqmmp ${QT_LIBRARIES})
+SET_TARGET_PROPERTIES(libqmmp PROPERTIES COMPILE_DEFINITIONS "${libqmmp_DEFINES}")
 SET_TARGET_PROPERTIES(libqmmp PROPERTIES VERSION ${QMMP_VERSION} SOVERSION ${QMMP_SOVERSION} OUTPUT_NAME qmmp)
 install(TARGETS libqmmp LIBRARY DESTINATION ${LIB_DIR}
                         RUNTIME DESTINATION bin
diff --git a/src/qmmpui/CMakeLists.txt b/src/qmmpui/CMakeLists.txt
index d8b95e974..1167ebb7c 100644
--- a/src/qmmpui/CMakeLists.txt
+++ b/src/qmmpui/CMakeLists.txt
@@ -1,9 +1,5 @@
 project(libqmmpui)
 
-if(COMMAND cmake_policy)
-cmake_policy(SET CMP0005 OLD)
-endif(COMMAND cmake_policy)
-
 SET(QT_USE_QTNETWORK TRUE)
 INCLUDE(FindQt4)
 include(${QT_USE_FILE})