Bunch of CMake fixes

* Add more Git ignore patterns
* Fix Ogg dependency handling (closes #203)
* Remove unneeded compiler flag (closes #204)
* Fix Visual Studio DLL build error error C2491:
  'flac_internal_rename_utf8': definition of dllimport function not
  allowed (closes #205)
* Add alias targets
* Reduce number of CMake files
* Improve CMake intrinsics detection

5 files changed, 25 insertions, 30 deletions

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index c7b075b1..9af88e4e 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -19,7 +19,28 @@ doxygen_add_docs(FLAC-doxygen
     "${PROJECT_SOURCE_DIR}/include/FLAC"
     "${PROJECT_SOURCE_DIR}/include/FLAC++")
 
-add_subdirectory(html)
-
 install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html/"
     DESTINATION "${CMAKE_INSTALL_DOCDIR}/html/api")
+
+install(FILES
+    html/images/logo.svg
+    html/images/logo130.gif
+    html/changelog.html
+    html/developers.html
+    html/documentation.html
+    html/documentation_bugs.html
+    html/documentation_example_code.html
+    html/documentation_format_overview.html
+    html/documentation_tools.html
+    html/documentation_tools_flac.html
+    html/documentation_tools_metaflac.html
+    html/faq.html
+    html/favicon.ico
+    html/features.html
+    html/flac.css
+    html/format.html
+    html/id.html
+    html/index.html
+    html/license.html
+    html/ogg_mapping.html
+DESTINATION "${CMAKE_INSTALL_DOCDIR}/html")
diff --git a/doc/html/CMakeLists.txt b/doc/html/CMakeLists.txt
deleted file mode 100644
index 6ac1e116..00000000
--- a/doc/html/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-add_subdirectory(images)
-
-install(FILES
-    changelog.html
-    developers.html
-    documentation.html
-    documentation_bugs.html
-    documentation_example_code.html
-    documentation_format_overview.html
-    documentation_tools.html
-    documentation_tools_flac.html
-    documentation_tools_metaflac.html
-    faq.html
-    favicon.ico
-    features.html
-    flac.css
-    format.html
-    id.html
-    index.html
-    license.html
-    ogg_mapping.html
-DESTINATION "${CMAKE_INSTALL_DOCDIR}/html")
diff --git a/doc/html/Makefile.am b/doc/html/Makefile.am
index 3a274ef5..2c73fdbb 100644
--- a/doc/html/Makefile.am
+++ b/doc/html/Makefile.am
@@ -38,7 +38,7 @@ html_DATA = \
 	license.html \
 	ogg_mapping.html
 
-EXTRA_DIST = $(html_DATA) api CMakeLists.txt
+EXTRA_DIST = $(html_DATA) api
 
 if FLaC__HAS_DOXYGEN
 # The install targets don't copy whole directories so we have to
diff --git a/doc/html/images/CMakeLists.txt b/doc/html/images/CMakeLists.txt
deleted file mode 100644
index 922d305c..00000000
--- a/doc/html/images/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-install(FILES
-    logo.svg
-    logo130.gif
-DESTINATION "${CMAKE_INSTALL_DOCDIR}/html/images")
diff --git a/doc/html/images/Makefile.am b/doc/html/images/Makefile.am
index 04ad59aa..467651cd 100644
--- a/doc/html/images/Makefile.am
+++ b/doc/html/images/Makefile.am
@@ -22,4 +22,4 @@ logos_DATA = \
 	logo.svg \
 	logo130.gif
 
-EXTRA_DIST = $(logos_DATA) CMakeLists.txt
+EXTRA_DIST = $(logos_DATA)