[Digikam-devel] [digikam] [Bug 339180] cmake and/or compiler pick up libkgeomap header files from previous version

[Gilles Caulier]

https://bugs.kde.org/show_bug.cgi?id=339180

Gilles Caulier <caulier.gilles at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Resolution|---                         |FIXED
             Status|UNCONFIRMED                 |RESOLVED
      Latest Commit|                            |http://commits.kde.org/libk
                   |                            |geomap/c9443120550a552ebc09
                   |                            |e83bce26c272813777b5
   Version Fixed In|                            |4.5.0

--- Comment #24 from Gilles Caulier <caulier.gilles at gmail.com> ---
Git commit c9443120550a552ebc09e83bce26c272813777b5 by Gilles Caulier.
Committed on 30/10/2014 at 22:09.
Pushed by cgilles into branch 'master'.

add top level variable rule

M  +21   -16   libkgeomap/CMakeLists.txt

http://commits.kde.org/libkgeomap/c9443120550a552ebc09e83bce26c272813777b5

diff --git a/libkgeomap/CMakeLists.txt b/libkgeomap/CMakeLists.txt
index 128ec71..e3e868d 100644
--- a/libkgeomap/CMakeLists.txt
+++ b/libkgeomap/CMakeLists.txt
@@ -93,19 +93,24 @@ SET_TARGET_PROPERTIES(kgeomap PROPERTIES VERSION
${KGEOMAP_LIB_SO_VERSION_STRING

 INSTALL(TARGETS kgeomap ${INSTALL_TARGETS_DEFAULT_ARGS})

-INSTALL(FILES libkgeomap_export.h
-              abstractmarkertiler.h
-              dragdrophandler.h
-              geocoordinates.h
-              itemmarkertiler.h
-              kgeomap_primitives.h
-              kgeomap_widget.h
-              lookup_altitude.h
-              lookup_factory.h
-              modelhelper.h
-              tileindex.h
-              tracks.h
-              track_reader.h
-              ${CMAKE_CURRENT_BINARY_DIR}/version.h
-        DESTINATION ${INCLUDE_INSTALL_DIR}/libkgeomap COMPONENT Devel
-       )
+# Check if compilation is done through digiKam SC or not. If yes, do not
install header files.
+IF(NOT DIGIKAMSC_USE_PRIVATE_SHAREDLIBS)
+
+    INSTALL(FILES libkgeomap_export.h
+                  abstractmarkertiler.h
+                  dragdrophandler.h
+                  geocoordinates.h
+                  itemmarkertiler.h
+                  kgeomap_primitives.h
+                  kgeomap_widget.h
+                  lookup_altitude.h
+                  lookup_factory.h
+                  modelhelper.h
+                  tileindex.h
+                  tracks.h
+                  track_reader.h
+                  ${CMAKE_CURRENT_BINARY_DIR}/version.h
+            DESTINATION ${INCLUDE_INSTALL_DIR}/libkgeomap COMPONENT Devel
+        )
+
+ENDIF()

-- 
You are receiving this mail because:
You are the assignee for the bug.