1 files changed, 20 insertions, 30 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05db71d..ba105b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,12 +41,12 @@ if (use_libclang)
 	set(clang    "1" CACHE INTERNAL "used in settings.h")
         find_package(LLVM CONFIG REQUIRED)
         find_package(Clang CONFIG REQUIRED)
-    if (${CMAKE_SYSTEM} MATCHES "Darwin")
+    if (CMAKE_SYSTEM MATCHES "Darwin")
         set(MACOS_VERSION_MIN 10.11)
     endif()
 endif()
 
-if (${CMAKE_SYSTEM} MATCHES "Darwin")
+if (CMAKE_SYSTEM MATCHES "Darwin")
     set(CMAKE_CXX_FLAGS "-Wno-deprecated-register -mmacosx-version-min=${MACOS_VERSION_MIN} ${CMAKE_CXX_FLAGS}")
     set(CMAKE_C_FLAGS "-Wno-deprecated-register -mmacosx-version-min=${MACOS_VERSION_MIN} ${CMAKE_C_FLAGS}")
     find_library(CORESERVICES_LIB CoreServices)
@@ -54,7 +54,7 @@ if (${CMAKE_SYSTEM} MATCHES "Darwin")
 endif()
 
 if (WIN32)
-    if (NOT "${CMAKE_GENERATOR}" MATCHES ".*MinGW Makefiles.*")
+    if (NOT CMAKE_GENERATOR MATCHES "MinGW Makefiles")
         if (NOT ICONV_DIR)
           set(ICONV_DIR "${CMAKE_SOURCE_DIR}/winbuild")
         endif()
@@ -71,13 +71,13 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 set(CMAKE_C_VISIBILITY_PRESET hidden)
 set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
 
-if ("${CMAKE_GENERATOR}" MATCHES "Ninja") 
+if (CMAKE_GENERATOR MATCHES "Ninja")
   set(LEX_FLAGS )
   set(YACC_FLAGS )
-else ("${CMAKE_GENERATOR}" MATCHES "Ninja") 
+else ()
   set(LEX_FLAGS $(LEX_FLAGS))
   set(YACC_FLAGS $(YACC_FLAGS))
-endif ("${CMAKE_GENERATOR}" MATCHES "Ninja") 
+endif ()
 
 find_program(DOT NAMES dot)
 find_package(PythonInterp REQUIRED)
@@ -99,8 +99,6 @@ set(ENV{DOXYGEN_DOCDIR} ${DOXYDOCS})
 set(GENERATED_SRC "${CMAKE_BINARY_DIR}/generated_src" CACHE INTERNAL "Stores generated files")
 set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-set(CUSTOM_INCLUDE_DIR "" CACHE FILEPATH "Extra include path")
-set(CUSTOM_LINK_DIR "" CACHE FILEPATH "Extra library path")
 
 # place binaries for all build types in the same directory, so we know where to find it
 # when running tests or generating docs
@@ -111,25 +109,18 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${EXECUTABLE_OUTPUT_PATH})
 
 # gather lang codes for translation
 file(GLOB lang_files RELATIVE "${CMAKE_SOURCE_DIR}/src" "${CMAKE_SOURCE_DIR}/src/translator_??.h")
-set(lcodes "")
-foreach (_lang ${lang_files})
-  string(REGEX REPLACE "translator_(.*).h" "\\1" _lang_code ${_lang})
-  string(TOUPPER ${_lang_code} lang_code)
-  list(APPEND lcodes "${lang_code}")
-endforeach()
 if (english_only) # user only wants English
   set(lcodes "ENONLY")
+else ()
+  set(lcodes "")
+  foreach (_lang ${lang_files})
+    string(REGEX REPLACE "translator_(.*).h" "\\1" _lang_code ${_lang})
+    string(TOUPPER ${_lang_code} lang_code)
+    list(APPEND lcodes "${lang_code}")
+  endforeach()
 endif()
 set(LANG_CODES ${lcodes} CACHE STRING "List of language codes for which translations should be compiled in")
 
-if (${CUSTOM_INCLUDE_DIR})
-   include_directories(${CUSTOM_INCLUDE_DIR})
-endif()
-
-if (${CUSTOM_LINK_DIR})
-   link_directories(${CUSTOM_LINK_DIR})
-endif()
-
 if (win_static)
     set(CompilerFlags
         CMAKE_CXX_FLAGS
@@ -152,14 +143,13 @@ add_subdirectory(libmd5)
 add_subdirectory(qtools)
 add_subdirectory(vhdlparser)
 add_subdirectory(src)
-add_subdirectory(examples)
-add_subdirectory(doc)
-
-add_subdirectory(addon/doxmlparser)
-add_subdirectory(addon/doxyapp)
-add_subdirectory(addon/doxyparse)
-add_subdirectory(addon/doxysearch)
-add_subdirectory(addon/doxywizard)
+
+if (build_doc)
+    add_subdirectory(examples)
+    add_subdirectory(doc)
+endif ()
+
+add_subdirectory(addon)
 
 enable_testing()
 add_subdirectory(testing)