From d08242a230b07db9f8a3eb5cbef2a9a0631f9452 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Thu, 8 Aug 2019 14:39:36 +0200 Subject: Rename version libary to avoid name clash with Window's version.lib --- addon/doxyapp/CMakeLists.txt | 2 +- addon/doxyparse/CMakeLists.txt | 2 +- addon/doxywizard/CMakeLists.txt | 4 ++-- libversion/CMakeLists.txt | 6 +++--- src/CMakeLists.txt | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt index f205664..ae52cab 100644 --- a/addon/doxyapp/CMakeLists.txt +++ b/addon/doxyapp/CMakeLists.txt @@ -23,7 +23,7 @@ qtools md5 lodepng mscgen -version +doxygen_version doxycfg vhdlparser ${ICONV_LIBRARIES} diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt index e76f031..2387f1b 100644 --- a/addon/doxyparse/CMakeLists.txt +++ b/addon/doxyparse/CMakeLists.txt @@ -23,7 +23,7 @@ qtools md5 lodepng mscgen -version +doxygen_version doxycfg vhdlparser ${ICONV_LIBRARIES} diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt index 9aba4e4..6ae71a6 100644 --- a/addon/doxywizard/CMakeLists.txt +++ b/addon/doxywizard/CMakeLists.txt @@ -104,9 +104,9 @@ doxywizard.rc ) if(Qt5Core_FOUND) - target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml version) + target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml doxygen_version) else() - target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} version) + target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} doxygen_version) endif() install(TARGETS doxywizard DESTINATION bin) diff --git a/libversion/CMakeLists.txt b/libversion/CMakeLists.txt index 1a430fd..34e8655 100644 --- a/libversion/CMakeLists.txt +++ b/libversion/CMakeLists.txt @@ -15,13 +15,13 @@ include_directories( . ) -add_library(version STATIC +add_library(doxygen_version STATIC ${POST_CONFIGURE_DOXYGEN_VERSION_FILE} ${POST_CONFIGURE_GIT_VERSION_FILE} ) -add_dependencies( version check_git_repository ) -add_dependencies( version check_doxygen_version ) +add_dependencies( doxygen_version check_git_repository ) +add_dependencies( doxygen_version check_doxygen_version ) set_source_files_properties(${POST_CONFIGURE_GIT_VERSION_FILE} PROPERTIES GENERATED 1) set_source_files_properties(${POST_CONFIGURE_DOXYGEN_VERSION_FILE} PROPERTIES GENERATED 1) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 06e0e44..7233052 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -280,7 +280,7 @@ target_link_libraries(doxygen md5 lodepng mscgen - version + doxygen_version vhdlparser ${SQLITE3_LIBRARIES} ${ICONV_LIBRARIES} -- cgit v0.12