Merge pull request #249 from sunpoet/master

Fix examples installation and respect KML_EXAMPLES_DIR
libkml · Jan 15, 2017 · 916a801 · 916a801
2 parents c488223 + ecc4413
commit 916a801
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/examples/domviewer/CMakeLists.txt b/examples/domviewer/CMakeLists.txt
@@ -1,3 +1,3 @@
 if(INSTALL_EXAMPLES)
-  install( FILES kml-aliases.txt DESTINATION ${KML_EXAMPLES_DIR} COMPONENT Development)
+  install( FILES domviewer.py DESTINATION ${KML_EXAMPLES_DIR} COMPONENT Development)
 endif()
diff --git a/examples/engine/CMakeLists.txt b/examples/engine/CMakeLists.txt
@@ -60,5 +60,5 @@ build_example(
 
 if(INSTALL_EXAMPLES)
   file(GLOB eg_files "${CMAKE_CURRENT_SOURCE_DIR}/*.cc")
-  install(FILES ${eg_files}  DESTINATION examples/engine)
+  install(FILES ${eg_files}  DESTINATION ${KML_EXAMPLES_DIR}/engine)
 endif(INSTALL_EXAMPLES)
diff --git a/examples/gpx/CMakeLists.txt b/examples/gpx/CMakeLists.txt
@@ -9,5 +9,5 @@ build_example(
 
 if(INSTALL_EXAMPLES)
   file(GLOB eg_files "${CMAKE_CURRENT_SOURCE_DIR}/*.cc")
-  install(FILES ${eg_files}  DESTINATION examples/gpx)
+  install(FILES ${eg_files}  DESTINATION ${KML_EXAMPLES_DIR}/gpx)
 endif(INSTALL_EXAMPLES)
diff --git a/examples/gx/CMakeLists.txt b/examples/gx/CMakeLists.txt
@@ -12,5 +12,5 @@ if(INSTALL_EXAMPLES)
 file(GLOB eg_files "${CMAKE_CURRENT_SOURCE_DIR}/*.cc")
 install(
   FILES ${eg_files}
-  DESTINATION examples/gx)
+  DESTINATION ${KML_EXAMPLES_DIR}/gx)
 endif()
diff --git a/examples/hellonet/CMakeLists.txt b/examples/hellonet/CMakeLists.txt
@@ -77,9 +77,9 @@ if(INSTALL_EXAMPLES)
 file(GLOB eg_files "${CMAKE_CURRENT_SOURCE_DIR}/*.cc")
 install(
   FILES ${eg_files}
-  DESTINATION examples/hellonet)
+  DESTINATION ${KML_EXAMPLES_DIR}/hellonet)
 
 install(
   FILES README curlfetch.h prompt.h
-  DESTINATION examples/hellonet)
+  DESTINATION ${KML_EXAMPLES_DIR}/hellonet)
 endif()
diff --git a/examples/java/CMakeLists.txt b/examples/java/CMakeLists.txt
@@ -2,8 +2,8 @@ if(INSTALL_EXAMPLES)
   file(GLOB eg_files "${CMAKE_CURRENT_SOURCE_DIR}/*.java")
   install(
     FILES ${eg_files}
-    DESTINATION examples/java) ##compile java
+    DESTINATION ${KML_EXAMPLES_DIR}/java) ##compile java
   install(
     FILES run.sh
-    DESTINATION examples/java) ##
+    DESTINATION ${KML_EXAMPLES_DIR}/java) ##
 endif()
diff --git a/examples/kml/CMakeLists.txt b/examples/kml/CMakeLists.txt
@@ -2,5 +2,5 @@ if(INSTALL_EXAMPLES)
   file(GLOB kml_files "${CMAKE_CURRENT_SOURCE_DIR}/*.kml")
   install(
     FILES ${kml_files}
-    DESTINATION examples/kml)
+    DESTINATION ${KML_EXAMPLES_DIR}/kml)
 endif()
diff --git a/examples/python/CMakeLists.txt b/examples/python/CMakeLists.txt
@@ -2,5 +2,5 @@ if(INSTALL_EXAMPLES)
   file(GLOB eg_files "${CMAKE_CURRENT_SOURCE_DIR}/*.py")
   install(
     FILES ${eg_files}
-    DESTINATION examples/python) ##compile python
+    DESTINATION ${KML_EXAMPLES_DIR}/python) ##compile python
 endif()
diff --git a/examples/regionator/CMakeLists.txt b/examples/regionator/CMakeLists.txt
@@ -10,5 +10,5 @@ if(INSTALL_EXAMPLES)
   file(GLOB eg_files "${CMAKE_CURRENT_SOURCE_DIR}/*.cc")
   install(
     FILES ${eg_files}
-    DESTINATION examples/regionator)
+    DESTINATION ${KML_EXAMPLES_DIR}/regionator)
 endif()
diff --git a/examples/xsd/CMakeLists.txt b/examples/xsd/CMakeLists.txt
@@ -1,5 +1,5 @@
 if(INSTALL_EXAMPLES)
-  install(FILES
-    domviewer.py
-    DESTINATION examples/xsd) #compile py
+  file(GLOB eg_files "${CMAKE_CURRENT_SOURCE_DIR}/*.cc")
+  install(FILES ${eg_files} DESTINATION ${KML_EXAMPLES_DIR}/xsd)
+  install(FILES kml-aliases.txt DESTINATION ${KML_EXAMPLES_DIR}/xsd)
 endif()