fix CMakeLists

3nids · 3nids · commit 6fc5d6a4cd6c · 2014-05-12T17:12:35.000+02:00
diff --git a/src/customwidgets/CMakeLists.txt b/src/customwidgets/CMakeLists.txt
@@ -39,18 +39,18 @@ SET(QGIS_CUSTOMWIDGETS_HDRS
   qgsscalerangewidgetplugin.h
 )
 
-SET(QGIS_CUSTOMWIDGETS_UI_HDRS
-  # ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsXXXwidget.h
-)
+# left commented as there is no UI file yet
+# SET(QGIS_CUSTOMWIDGETS_UI_HDRS
+#   ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsXXXwidget.h
+# )
 
 INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR} 
   ${CMAKE_CURRENT_SOURCE_DIR}/../core/
   ${CMAKE_CURRENT_SOURCE_DIR}/../gui/
-  ${CMAKE_CURRENT_BINARY_DIR}/../ui
+  # ${CMAKE_CURRENT_BINARY_DIR}/../ui (no UI file yet)
 )
 
-
 #############################################################
 # qgis_customwidgets library
 
@@ -59,23 +59,19 @@ ADD_LIBRARY(qgis_customwidgets SHARED ${QGIS_CUSTOMWIDGETS_SRCS} ${QGIS_CUSTOMWI
 # TODO: apple
 INSTALL(FILES ${QGIS_CUSTOMWIDGETS_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})
 
-
-#generate unversioned libs for android
-IF (NOT ANDROID)
-  SET_TARGET_PROPERTIES(qgis_customwidgets PROPERTIES
-    VERSION ${COMPLETE_VERSION}
-    SOVERSION ${COMPLETE_VERSION}
-    )
-ENDIF (NOT ANDROID)
+SET_TARGET_PROPERTIES(qgis_customwidgets PROPERTIES
+  VERSION ${COMPLETE_VERSION}
+  SOVERSION ${COMPLETE_VERSION}
+  )
 
 # make sure that UI files will be processed first
-ADD_DEPENDENCIES(qgis_customwidgets ui)
+# left commented as there is no UI file yet
+# ADD_DEPENDENCIES(qgis_customwidgets ui)
 
 TARGET_LINK_LIBRARIES(qgis_customwidgets qgis_gui)
 
 # install
 INSTALL(TARGETS qgis_customwidgets
-  LIBRARY DESTINATION ${QGIS_CUSTOMWIDGETS_DIR}
-  PUBLIC_HEADER DESTINATION ${QGIS_INCLUDE_DIR})
+  LIBRARY DESTINATION ${QGIS_CUSTOMWIDGETS_DIR})
 
 
