diff --git a/CMakeLists.txt b/CMakeLists.txt index ac16823..2ad85a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,17 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) # Options option(BUILD_SHARED_LIBS "Build shared libraries" OFF) option(BUILD_EXAMPLES "Build examples" ON) -option(BUILD_TESTING "Build tests" ON) +option(BUILD_TESTING "Build tests" OFF) + +# MSVC Runtime Library and other settings +if (MSVC) + if (BUILD_SHARED_LIBS) + set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") + set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + else () + set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") + endif () +endif () # Additional compile options for the Debug build if (NOT MSVC AND CMAKE_C_COMPILER_ID MATCHES "GNU|Clang|AppleClang") @@ -60,7 +70,8 @@ if (${CMAKE_C_COMPILER_ID} STREQUAL "Clang") endif () endif () -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake") +# Add the CMake module path +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") add_library(lite-string) target_sources(lite-string PRIVATE lite_string.c) diff --git a/cmake/Packing.cmake b/cmake/Packing.cmake index d7f8da0..a9ba6a5 100644 --- a/cmake/Packing.cmake +++ b/cmake/Packing.cmake @@ -54,7 +54,7 @@ set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Headers") set(CPACK_COMPONENT_HEADERS_DESCRIPTION "Header files for LiteString.") set(CPACK_COMPONENT_HEADERS_REQUIRED ON) -set(CPACK_COMPONENT_DATA_DISPLAY_NAME "Data") +set(CPACK_COMPONENT_DATA_DISPLAY_NAME "Version Info") set(CPACK_COMPONENT_DATA_DESCRIPTION "Information about this build of LiteString.") # Resource files