Use object library

Author: pfultz2

cmake/compileroptions.cmake

@@ -24,10 +24,25 @@ function(target_externals_include_directories TARGET)
     endif()
 endfunction()
 
-function(target_dll_compile_definitions TARGET EXPORT IMPORT)
+function(target_dll_compile_definitions TARGET)
+    set(options)
+    set(oneValueArgs IMPORT EXPORT)
+    set(multiValueArgs)
+
+    cmake_parse_arguments(PARSE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+    if(PARSE_UNPARSED_ARGUMENTS)
+        message(
+            FATAL_ERROR "Unknown keywords given to target_dll_compile_definitions(): \"${PARSE_UNPARSED_ARGUMENTS}\"")
+    endif()
+
+
     if (BUILD_SHARED_LIBS AND MSVC)
-        target_compile_definitions(simplecpp_objs PRIVATE ${EXPORT})
-        target_compile_definitions(simplecpp_objs INTERFACE ${IMPORT})
+        if(PARSE_EXPORT)
+            target_compile_definitions(simplecpp_objs PRIVATE ${PARSE_EXPORT})
+        endif()
+        if(PARSE_IMPORT)
+            target_compile_definitions(simplecpp_objs INTERFACE ${PARSE_IMPORT})
+        endif()
     endif()
 endfunction()
 

externals/simplecpp/CMakeLists.txt

@@ -2,7 +2,7 @@ file(GLOB hdrs "*.h")
 file(GLOB srcs "*.cpp")
 
 add_library(simplecpp ${srcs} ${hdrs})
-target_dll_compile_definitions(simplecpp SIMPLECPP_EXPORT SIMPLECPP_IMPORT)
+target_dll_compile_definitions(simplecpp EXPORT SIMPLECPP_EXPORT IMPORT SIMPLECPP_IMPORT)
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     target_compile_options_safe(simplecpp -Wno-zero-as-null-pointer-constant)

externals/tinyxml2/CMakeLists.txt

@@ -2,7 +2,7 @@ file(GLOB hdrs "*.h")
 file(GLOB srcs "*.cpp")
 
 add_library(tinyxml2 ${srcs} ${hdrs})
-target_dll_compile_definitions(tinyxml2 TINYXML2_EXPORT TINYXML2_IMPORT)
+target_dll_compile_definitions(tinyxml2 EXPORT TINYXML2_EXPORT IMPORT TINYXML2_IMPORT)
 
 # TODO: needs to be fixed upstream
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")

lib/CMakeLists.txt

@@ -37,22 +37,39 @@ else()
     set(srcs_lib ${srcs})
 endif()
 
-add_library(cppcheck-core ${srcs_lib} ${hdrs})
-target_dll_compile_definitions(simplecpp_objs CPPCHECKLIB_EXPORT CPPCHECKLIB_IMPORT)
+if(BUILD_SHARED_LIBS)
+    add_library(cppcheck-core ${srcs_lib} ${hdrs})
+    add_library(cppcheck-core-private ALIAS cppcheck-core)
+else()
+    # A OBJECT library is used because the auto-registration doesn't work with static libraries
+    add_library(cppcheck-core-private OBJECT ${srcs_lib} ${hdrs})
+    add_library(cppcheck-core INTERFACE)
+    target_link_libraries(cppcheck-core INTERFACE $<TARGET_OBJECTS:cppcheck-core-private>)
+    add_dependencies(cppcheck-core cppcheck-core-private)
+endif()
 if (BUILD_SHARED_LIBS AND MSVC)
     target_sources(cppcheck-core PRIVATE version.rc)
 endif()
 
-target_include_directories(cppcheck-core PUBLIC .)
-target_link_libraries(cppcheck-core PRIVATE tinyxml2 simplecpp picojson)
+target_dll_compile_definitions(cppcheck-core EXPORT CPPCHECKLIB_EXPORT)
+target_dll_compile_definitions(cppcheck-core-private IMPORT CPPCHECKLIB_IMPORT)
+
+target_include_directories(cppcheck-core INTERFACE .)
+foreach(lib tinyxml2 simplecpp picojson)
+    if (NOT BUILD_SHARED_LIBS)
+        target_link_libraries(cppcheck-core INTERFACE $<LINK_ONLY:${lib}>)
+    endif()
+    target_link_libraries(cppcheck-core-private PRIVATE ${lib})
+endforeach()
 
 if (HAVE_RULES)
-    target_include_directories(cppcheck-core SYSTEM PRIVATE ${PCRE_INCLUDE})
+    target_include_directories(cppcheck-core-private SYSTEM PRIVATE ${PCRE_INCLUDE})
 endif()
 if (Boost_FOUND)
-    target_include_directories(cppcheck-core SYSTEM PUBLIC ${Boost_INCLUDE_DIRS})
+    target_include_directories(cppcheck-core SYSTEM INTERFACE ${Boost_INCLUDE_DIRS})
+    target_include_directories(cppcheck-core-private SYSTEM PRIVATE ${Boost_INCLUDE_DIRS})
 endif()
 
 if (NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
-    target_precompile_headers(cppcheck-core PRIVATE precompiled.h)
+    target_precompile_headers(cppcheck-core-private PRIVATE precompiled.h)
 endif()