fixed cmake support

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

5 files changed, 13 insertions, 4 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2ed48b7d..60781b64b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,9 +9,13 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /opt/local/include)
 ENDIF()
 
-if(POLICY CMP0071)
+IF(POLICY CMP0071)
   cmake_policy(SET CMP0071 NEW)
-endif()
+ENDIF()
+
+IF(POLICY CMP0063)
+cmake_policy(SET CMP0063 NEW)
+ENDIF()
 
 #Qt5 modules
 SET(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} /opt/qt56/lib/cmake)
@@ -54,6 +58,8 @@ find_package(Qt5X11Extras 5.4.0)
 find_package(Qt5DBus 5.4.0)
 find_package(Qt5Multimedia 5.4.0)
 ADD_DEFINITIONS(-DQMMP_WS_X11)
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
 
 get_target_property(QT_LRELEASE_EXECUTABLE Qt5::lrelease IMPORTED_LOCATION)
 
diff --git a/bin/qmmp_launcher b/bin/qmmp_launcher
index 8dce947b6..51a10a3d0 100755
--- a/bin/qmmp_launcher
+++ b/bin/qmmp_launcher
@@ -1,7 +1,7 @@
 #!/bin/sh
 MYDIR=$(dirname $0)
 #QT_LIB_DIR=$(dirname $(which qmake))/../lib
-QT_LIB_DIR=/opt/qt56/lib
+QT_LIB_DIR=/opt/qt510/lib
 QMMP_LIB_DIRS=$MYDIR/../lib:$MYDIR/../src/qmmpui
 
 if [ -z ${LD_LIBRARY_PATH} ]; then
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 0383f53b5..31f61772c 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -1,6 +1,5 @@
 SET(USE_ENCA TRUE CACHE BOOL "enable/disable libenca support")
 include(FindPkgConfig)
-set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 pkg_search_module(ENCA enca>=1.9)
 pkg_search_module(TAGLIB taglib>=1.10)
 add_subdirectory(Input)
diff --git a/src/qmmp/CMakeLists.txt b/src/qmmp/CMakeLists.txt
index 48212b51a..270c1a8d1 100644
--- a/src/qmmp/CMakeLists.txt
+++ b/src/qmmp/CMakeLists.txt
@@ -90,6 +90,7 @@ SET(libqmmp_HDRS
     channelconverter_p.h
     dithering_p.h
     visualbuffer_p.h
+    qmmp_export.h
 )
 
 SET(libqmmp_DEVEL_HDRS
@@ -119,6 +120,7 @@ SET(libqmmp_DEVEL_HDRS
     visualfactory.h
     visual.h
     volume.h
+    qmmp_export.h
 )
 
 # Don't forget to include output directory, otherwise
diff --git a/src/qmmpui/CMakeLists.txt b/src/qmmpui/CMakeLists.txt
index 9142f6fe0..d4ede6378 100644
--- a/src/qmmpui/CMakeLists.txt
+++ b/src/qmmpui/CMakeLists.txt
@@ -71,6 +71,7 @@ SET(libqmmpui_HDRS
     playlistparser.h
     qmmpuiplugincache_p.h
     metadatahelper_p.h
+    qmmpui_export.h
 )
 
 SET(libqmmpui_DEVEL_HDRS
@@ -99,6 +100,7 @@ SET(libqmmpui_DEVEL_HDRS
     uihelper.h
     uiloader.h
     playlistheadermodel.h
+    qmmpui_export.h
 )