diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-09-23 09:39:27 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-09-23 09:39:27 +0000 |
| commit | 798e72a9347ecd96d2624e65dcabf463e8af1f7f (patch) | |
| tree | 67df3245ea4c4825df078c35974b6ab431978254 /src/plugins | |
| parent | 0a3371703b5ac4d9b2582244327badd4432bf581 (diff) | |
| download | qmmp-798e72a9347ecd96d2624e65dcabf463e8af1f7f.tar.gz qmmp-798e72a9347ecd96d2624e65dcabf463e8af1f7f.tar.bz2 qmmp-798e72a9347ecd96d2624e65dcabf463e8af1f7f.zip | |
removed CMP0005 policy
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7467 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/Input/archive/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/plugins/Input/cdaudio/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/plugins/Input/mad/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/plugins/Input/wildmidi/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/plugins/Transports/http/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/plugins/Transports/mms/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/plugins/Ui/qsui/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/plugins/Visual/projectm/CMakeLists.txt | 8 |
8 files changed, 2 insertions, 41 deletions
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) |
