Update CMake build files from 2.6 to modern CMake 3.9

The modern way of CMake build script has changed. To make CharLS more package friendly, update the overall CMake structure to modern CMake. For the moment target CMake 3.9 as the minimum, as this version is available on the Travis CI build system. Visual Studio 2017 15.9 Preview 4 is required on the Windows platform, but the Visual Studio solution file and MSBuild projects is on that platform the supported way to build CharLS.
2025-03-28 21:03:13 +00:00 · 2018-10-23 23:25:01 +02:00 · 2018-10-23 23:25:01 +02:00 · c391025c82
commit c391025c82
parent aa8ccc8412
15 changed files with 413 additions and 135 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -6,3 +6,10 @@ indent_size = 4
 indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
+
+[CMakeLists.txt]
+charset = utf-8
+indent_size = 2
+indent_style = space
+insert_final_newline = false
+trim_trailing_whitespace = true
--- a/.travis.yml
+++ b/.travis.yml
@ -23,6 +23,6 @@ sudo: false
 before_script:
  - mkdir debug
  - cd debug
-  - cmake -DCMAKE_BUILD_TYPE=Debug ..
+  - cmake -DCMAKE_BUILD_TYPE=Debug -DCHARLS_PEDANTIC_WARNINGS=On -DCHARLS_THREAT_WARNINGS_AS_ERRORS=On ..

 script: make
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,68 +1,126 @@
-cmake_minimum_required(VERSION 2.6)
-project(charls)
-
-# The following compiler option are only meant for GCC:
-if (CMAKE_COMPILER_IS_GNUCC)
-    # the following is optimization micromanagement that made better code for x86
-    # SET(CMAKE_CXX_FLAGS "-D NDEBUG -O3 -Wall -Wextra -pedantic -fvisibility=hidden -fomit-frame-pointer -momit-leaf-frame-pointer -fweb  -ftracer" )
-
-    # Define GNU C++ defines for both Debug and Release
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -Wextra -pedantic")
-
-    # Define specific Debug settings.
-    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
-
-    # Define specific Release settings.
-    set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D NDEBUG -O3")
-ENDIF ()
-
-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    # Define clang C++ defines for both Debug and Release
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Weverything")
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++98-compat")            # Ignore, CharLS 2.x targets C++14, ignore C++98 compatibility. 
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++98-compat-pedantic")   # Ignore, CharLS 2.x targets C++14, ignore C++98 compatibility.
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-conversion")         # Ignore, would just introduce ugly static_asserts.
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-padded")                  # Ignore, padding optimization is not needed.
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-switch-enum")             # Ignore, cases are handled by default.
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-global-constructors")     # Ignore, by design CharLS uses types created at startup.
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-exit-time-destructors")   # Ignore, better for memory leak tracking.
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-weak-vtables")            # Ignore, linker will remove the couple of extra vtables.
-
-    # Define specific Debug settings.
-    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
-
-    # Define specific Release settings.
-    set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D NDEBUG -O3")
-endif()
-
-option (BUILD_SHARED_LIBS "Build CharLS with shared libraries." OFF)
-option (BUILD_TESTING     "Build tests"                         ON)
-
-if (WIN32)
-   if (BUILD_SHARED_LIBS)
-     add_definitions(-D CHARLS_DLL)
-     set_source_files_properties(src/interface.cpp PROPERTIES COMPILE_FLAGS -DCHARLS_DLL_BUILD)
-   else()
-     add_definitions(-D CHARLS_STATIC)
-   endif()
-endif()
-
-set (charls_PUBLIC_HEADERS include/charls/charls.h include/charls/publictypes.h)
-
-add_library(CharLS src/interface.cpp src/jpegls.cpp src/jpegmarkersegment.cpp src/jpegstreamreader.cpp src/jpegstreamwriter.cpp)
-set (CHARLS_LIB_MAJOR_VERSION 2)
-set (CHARLS_LIB_MINOR_VERSION 0)
-set_target_properties(CharLS PROPERTIES
-                             VERSION ${CHARLS_LIB_MAJOR_VERSION}.${CHARLS_LIB_MINOR_VERSION}
-                             SOVERSION ${CHARLS_LIB_MAJOR_VERSION})
-
-install (TARGETS CharLS RUNTIME DESTINATION bin
-                        LIBRARY DESTINATION lib${LIB_SUFFIX}
-                        ARCHIVE DESTINATION lib${LIB_SUFFIX})
-install (FILES ${charls_PUBLIC_HEADERS} DESTINATION include/CharLS)
-
-if (BUILD_TESTING)
-  include_directories(include)
-  add_executable(charlstest test/main.cpp test/gettime.cpp test/util.cpp test/bitstreamdamage.cpp test/compliance.cpp test/performance.cpp test/dicomsamples.cpp)
-  target_link_libraries (charlstest CharLS)
-endif ()
+# Copyright (c) Team CharLS. All rights reserved. See the accompanying "LICENSE.md" for licensed use.
+
+cmake_minimum_required(VERSION 3.9...3.12)
+
+project(charls VERSION 2.0.1 LANGUAGES C CXX)
+
+# Determine if project is built as a subproject (using add_subdirectory) or if it is the master project.
+set(MASTER_PROJECT OFF)
+if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+  set(MASTER_PROJECT ON)
+  message(STATUS "Building as master project, CMake version: ${CMAKE_VERSION}")
+endif ()
+
+# The basic options to control what is build extra.
+option(CHARLS_BUILD_TESTS "Build test application" ${MASTER_PROJECT})
+option(CHARLS_BUILD_SAMPLES "Build sample applications" ${MASTER_PROJECT})
+option(CHARLS_INSTALL "Generate the install target." ${MASTER_PROJECT})
+
+# The options used by the CI builds to ensure the source remains warning free.
+# Not enabled by default to make CharLS package and end-user friendly.
+option(CHARLS_PEDANTIC_WARNINGS "Enable extra warnings and static analysis." OFF)
+option(CHARLS_THREAT_WARNINGS_AS_ERRORS "Treat Warnings as Errors." OFF)
+
+# CharLS requires C++14 or newer.
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# Configure the supported C++ compilers: gcc, clang and MSVC
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+  set(PEDANTIC_CXX_COMPILE_FLAGS
+    -pedantic-errors
+    -Wall
+    -Wextra
+    -pedantic
+    -Wold-style-cast
+    -Wfloat-equal
+    -Wlogical-op
+    -Wundef
+    -Wredundant-decls
+    -Wshadow
+    -Wwrite-strings
+    -Wpointer-arith
+    -Wcast-qual
+    -Wformat=2
+    -Wmissing-include-dirs
+    -Wcast-align
+    -Wctor-dtor-privacy
+    -Wdisabled-optimization
+    -Winvalid-pch
+    -Woverloaded-virtual
+    -Wnon-virtual-dtor
+    -Wnoexcept
+    -Wdouble-promotion
+    -Wtrampolines
+    -Wzero-as-null-pointer-constant
+    -Wuseless-cast
+    -Wvector-operation-performance
+    -Wsized-deallocation
+  )
+  if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
+      set(PEDANTIC_CXX_COMPILE_FLAGS ${PEDANTIC_CXX_COMPILE_FLAGS}
+        -Wshift-overflow=2
+        -Wnull-dereference
+        -Wduplicated-cond
+      )
+  endif()
+
+  set(WERROR_FLAG -Werror)
+endif()
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  set(PEDANTIC_CXX_COMPILE_FLAGS
+      -Weverything
+      -Wpedantic
+      -Wno-weak-vtables                       # Ignore, linker will remove the couple of extra vtables.
+      -Wno-padded                             # Ignore, padding optimization is not needed.
+      -Wno-c++98-compat                       # Ignore, CharLS 2.x targets C++14, ignore C++98 compatibility.
+      -Wno-c++98-compat-pedantic              # Ignore, CharLS 2.x targets C++14, ignore C++98 compatibility.
+      -Wno-global-constructors                # Ignore, by design CharLS uses types created at startup.
+      -Wno-switch-enum                        # Ignore, cases are handled by default.
+      -Wno-sign-conversion                    # Ignore, would just introduce ugly static_asserts.
+      -Wno-exit-time-destructors              # Ignore, by design exit-time destructors are used.
+      -Wno-missing-braces                     # Ignore, False warning in clang 5.0, fixed in 6.0.
+  )
+
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0.2)
+    set(PEDANTIC_CXX_COMPILE_FLAGS ${PEDANTIC_CXX_COMPILE_FLAGS}
+      -Wno-undefined-func-template            # Ignore, linker will complain if final template code is not available.
+    )
+  endif()
+
+  set(WERROR_FLAG -Werror)
+endif()
+
+if(MSVC)
+  set(PEDANTIC_CXX_COMPILE_FLAGS /W4)
+  set(WERROR_FLAG /WX)
+
+  # CharLS is cross-platform and cannot use the MSVC only secure CRT functions.
+  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+endif()
+
+# When enabled apply the pedantic warnings options and warnings as errors to globally.
+if(CHARLS_PEDANTIC_WARNINGS)
+
+  if(MSVC)
+    # Remove existing warning level (W3 is added by default by CMake), duplicate level will generate cmd-line warnings.
+    string(REGEX REPLACE " /W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+  endif()
+
+  add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:${PEDANTIC_CXX_COMPILE_FLAGS}>")
+endif()
+
+if(CHARLS_THREAT_WARNINGS_AS_ERRORS)
+  add_compile_options(${WERROR_FLAG})
+endif()
+
+include(src/CMakeLists.txt)
+
+if(CHARLS_BUILD_TESTS)
+  add_subdirectory(test)
+endif()
+
+if(CHARLS_BUILD_SAMPLES)
+  add_subdirectory(samples)
+endif()
--- a/CMakeSettings.json
+++ b/CMakeSettings.json
@ -0,0 +1,96 @@
+{
+  "configurations": [
+    {
+      "name": "x86-Debug",
+      "generator": "Ninja",
+      "configurationType": "Debug",
+      "inheritEnvironments": [
+        "msvc_x86"
+      ],
+      "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
+      "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v",
+      "ctestCommandArgs": "",
+      "variables": [
+        {
+          "name": "CHARLS_THREAT_WARNINGS_AS_ERRORS",
+          "value": "On"
+        },
+        {
+          "name": "CHARLS_PEDANTIC_WARNINGS",
+          "value": "On"
+        }
+      ]
+    },
+    {
+      "name": "x86-Release",
+      "generator": "Ninja",
+      "configurationType": "RelWithDebInfo",
+      "inheritEnvironments": [
+        "msvc_x86"
+      ],
+      "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
+      "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v",
+      "ctestCommandArgs": "",
+      "variables": [
+        {
+          "name": "CHARLS_THREAT_WARNINGS_AS_ERRORS",
+          "value": "On"
+        },
+        {
+          "name": "CHARLS_PEDANTIC_WARNINGS",
+          "value": "On"
+        }
+      ]
+    },
+    {
+      "name": "x64-Debug",
+      "generator": "Ninja",
+      "configurationType": "Debug",
+      "inheritEnvironments": [
+        "msvc_x64_x64"
+      ],
+      "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
+      "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v",
+      "ctestCommandArgs": "",
+      "variables": [
+        {
+          "name": "CHARLS_THREAT_WARNINGS_AS_ERRORS",
+          "value": "On"
+        },
+        {
+          "name": "CHARLS_PEDANTIC_WARNINGS",
+          "value": "On"
+        }
+      ]
+    },
+    {
+      "name": "x64-Release",
+      "generator": "Ninja",
+      "configurationType": "RelWithDebInfo",
+      "inheritEnvironments": [
+        "msvc_x64_x64"
+      ],
+      "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
+      "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v",
+      "ctestCommandArgs": "",
+      "variables": [
+        {
+          "name": "CHARLS_THREAT_WARNINGS_AS_ERRORS",
+          "value": "On"
+        },
+        {
+          "name": "CHARLS_PEDANTIC_WARNINGS",
+          "value": "On"
+        }
+      ]
+    }
+  ]
+}
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -67,6 +67,9 @@
        /wd5026 /wd5027 /wd5039 /wd5042 /wd5045
      </AdditionalOptions>

+      <!--  CharLS is cross-platform and cannot use the MSVC only secure CRT library functions. -->
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+
      <!-- Use all cores to speed up the compilation (MS recommended best practice). -->
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      
--- a/include/charls/charls.h
+++ b/include/charls/charls.h
@ -4,34 +4,48 @@

 #include "publictypes.h"

-// Windows and building CharLS DLL itself.
-#if defined(_WIN32) && defined(CHARLS_DLL_BUILD)
-#define CHARLS_DLL_IMPORT_EXPORT(returntype) __declspec(dllexport) returntype __stdcall  // NOLINT
+
+#if defined(CHARLS_STATIC)
+
+// CharLS is used as a static library, just define the entry points as extern.
+#define CHARLS_API_IMPORT_EXPORT extern
+#define CHARLS_API_CALLING_CONVENTION
+
+#else
+
+// CharLS is used as a DLL \ shared library, define the entry points as required.
+#if defined(_WIN32)
+
+#if defined(CHARLS_LIBRARY_BUILD)
+#define CHARLS_API_IMPORT_EXPORT __declspec(dllexport)
+#else
+#define CHARLS_API_IMPORT_EXPORT __declspec(dllexport)
 #endif

-// Non-windows (static linking)
-#if !defined(CHARLS_DLL_IMPORT_EXPORT) && !defined(_WIN32)
-#define CHARLS_DLL_IMPORT_EXPORT(returntype) returntype
+// Ensure that the exported functions of a 32 bit Windows DLL use the __stdcall convention.
+#if defined(_M_IX86)
+#define CHARLS_API_CALLING_CONVENTION __stdcall
+#else
+#define CHARLS_API_CALLING_CONVENTION
 #endif

-// Windows static linking
-#if !defined(CHARLS_DLL_IMPORT_EXPORT) && defined(CHARLS_STATIC)
-#define CHARLS_DLL_IMPORT_EXPORT(returntype) returntype
+#else
+
+#if defined(CHARLS_LIBRARY_BUILD)
+#define CHARLS_API_IMPORT_EXPORT __attribute__((visibility("default")))
+#else
+#define CHARLS_API_IMPORT_EXPORT extern
 #endif

-// Windows DLL
-#if !defined(CHARLS_DLL_IMPORT_EXPORT) && defined(CHARLS_DLL)
-#define CHARLS_DLL_IMPORT_EXPORT(returntype) __declspec(dllimport) returntype __stdcall
+#define CHARLS_API_CALLING_CONVENTION
+
 #endif

-#if !defined(CHARLS_DLL_IMPORT_EXPORT)
-#error Please #define CHARLS_STATIC or CHARLS_DLL before including "charls.h" to indicate if CharLS is built as a static library or as a DLL.
 #endif


 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #else
 #include <stddef.h>
 #endif
@ -46,8 +60,14 @@ extern "C"
 /// <param name="sourceLength">Length of the array in bytes.</param>
 /// <param name="params">Parameter object that describes the pixel data and how to encode it.</param>
 /// <param name="errorMessage">Character array of at least 256 characters or NULL. Hold the error message when a failure occurs, empty otherwise.</param>
-CHARLS_DLL_IMPORT_EXPORT(CharlsApiResultType) JpegLsEncode(void* destination, size_t destinationLength, size_t* bytesWritten,
-    const void* source, size_t sourceLength, const struct JlsParameters* params, char* errorMessage);
+CHARLS_API_IMPORT_EXPORT CharlsApiResultType CHARLS_API_CALLING_CONVENTION JpegLsEncode(
+    void* destination,
+    size_t destinationLength,
+    size_t* bytesWritten,
+    const void* source,
+    size_t sourceLength,
+    const struct JlsParameters* params,
+    char* errorMessage);

 /// <summary>
 /// Retrieves the JPEG-LS header. This info can be used to pre-allocate the uncompressed output buffer.
@ -56,8 +76,11 @@ CHARLS_DLL_IMPORT_EXPORT(CharlsApiResultType) JpegLsEncode(void* destination, si
 /// <param name="compressedLength">Length of the array in bytes.</param>
 /// <param name="params">Parameter object that describes how the pixel data is encoded.</param>
 /// <param name="errorMessage">Character array of at least 256 characters or NULL. Hold the error message when a failure occurs, empty otherwise.</param>
- CHARLS_DLL_IMPORT_EXPORT(CharlsApiResultType) JpegLsReadHeader(const void* compressedData, size_t compressedLength,
-    struct JlsParameters* params, char* errorMessage);
+CHARLS_API_IMPORT_EXPORT CharlsApiResultType CHARLS_API_CALLING_CONVENTION JpegLsReadHeader(
+    const void* compressedData,
+    size_t compressedLength,
+    struct JlsParameters* params,
+    char* errorMessage);

 /// <summary>
 /// Encodes a JPEG-LS encoded byte array to uncompressed pixel data byte array.
@ -68,18 +91,28 @@ CHARLS_DLL_IMPORT_EXPORT(CharlsApiResultType) JpegLsEncode(void* destination, si
 /// <param name="sourceLength">Length of the array in bytes.</param>
 /// <param name="params">Parameter object that describes the pixel data and how to decode it.</param>
 /// <param name="errorMessage">Character array of at least 256 characters or NULL. Hold the error message when a failure occurs, empty otherwise.</param>
-CHARLS_DLL_IMPORT_EXPORT(CharlsApiResultType) JpegLsDecode(void* destination, size_t destinationLength,
-    const void* source, size_t sourceLength, const struct JlsParameters* params, char* errorMessage);
+CHARLS_API_IMPORT_EXPORT CharlsApiResultType CHARLS_API_CALLING_CONVENTION JpegLsDecode(
+    void* destination,
+    size_t destinationLength,
+    const void* source,
+    size_t sourceLength,
+    const struct JlsParameters* params,
+    char* errorMessage);

-CHARLS_DLL_IMPORT_EXPORT(CharlsApiResultType) JpegLsDecodeRect(void* uncompressedData, size_t uncompressedLength,
-    const void* compressedData, size_t compressedLength,
-    struct JlsRect roi, const struct JlsParameters* info, char* errorMessage);
+CHARLS_API_IMPORT_EXPORT CharlsApiResultType CHARLS_API_CALLING_CONVENTION JpegLsDecodeRect(
+    void* uncompressedData,
+    size_t uncompressedLength,
+    const void* compressedData,
+    size_t compressedLength,
+    struct JlsRect roi,
+    const struct JlsParameters* info,
+    char* errorMessage);

 #ifdef __cplusplus
 }

-CHARLS_DLL_IMPORT_EXPORT(CharlsApiResultType) JpegLsEncodeStream(ByteStreamInfo compressedStreamInfo, size_t& bytesWritten, ByteStreamInfo rawStreamInfo, const JlsParameters& params, char* errorMessage);
-CHARLS_DLL_IMPORT_EXPORT(CharlsApiResultType) JpegLsDecodeStream(ByteStreamInfo rawStream, ByteStreamInfo compressedStream, const JlsParameters* info, char* errorMessage);
-CHARLS_DLL_IMPORT_EXPORT(CharlsApiResultType) JpegLsReadHeaderStream(ByteStreamInfo rawStreamInfo, JlsParameters* params, char* errorMessage);
+CHARLS_API_IMPORT_EXPORT CharlsApiResultType JpegLsEncodeStream(ByteStreamInfo compressedStreamInfo, size_t& bytesWritten, ByteStreamInfo rawStreamInfo, const JlsParameters& params, char* errorMessage);
+CHARLS_API_IMPORT_EXPORT CharlsApiResultType JpegLsDecodeStream(ByteStreamInfo rawStream, ByteStreamInfo compressedStream, const JlsParameters* info, char* errorMessage);
+CHARLS_API_IMPORT_EXPORT CharlsApiResultType JpegLsReadHeaderStream(ByteStreamInfo rawStreamInfo, JlsParameters* params, char* errorMessage);

 #endif
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@ -0,0 +1,3 @@
+# Copyright (c) Team CharLS. All rights reserved. See the accompanying "LICENSE.md" for licensed use.
+
+add_subdirectory(convert.c)
--- a/samples/convert.c/CMakeLists.txt
+++ b/samples/convert.c/CMakeLists.txt
@ -0,0 +1,10 @@
+# Copyright (c) Team CharLS. All rights reserved. See the accompanying "LICENSE.md" for licensed use.
+
+add_executable(convert.c "")
+
+target_sources(convert.c
+  PRIVATE
+    main.c
+)
+
+target_link_libraries(convert.c PRIVATE charls)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -0,0 +1,55 @@
+# Copyright (c) Team CharLS. All rights reserved. See the accompanying "LICENSE.md" for licensed use.
+
+# Define the library "charls" target
+add_library(charls "")
+
+target_include_directories(charls PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+  $<INSTALL_INTERFACE:include>)
+
+if(NOT BUILD_SHARED_LIBS)
+  target_compile_definitions(charls PUBLIC CHARLS_STATIC)
+endif()
+
+target_compile_definitions(charls PRIVATE CHARLS_LIBRARY_BUILD)
+
+target_sources(charls
+  PUBLIC
+    "${CMAKE_CURRENT_SOURCE_DIR}/include/charls/charls.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/include/charls/publictypes.h"
+  PRIVATE
+    "${CMAKE_CURRENT_LIST_DIR}/colortransform.h"
+    "${CMAKE_CURRENT_LIST_DIR}/constants.h"
+    "${CMAKE_CURRENT_LIST_DIR}/context.h"
+    "${CMAKE_CURRENT_LIST_DIR}/contextrunmode.h"
+    "${CMAKE_CURRENT_LIST_DIR}/decoderstrategy.h"
+    "${CMAKE_CURRENT_LIST_DIR}/defaulttraits.h"
+    "${CMAKE_CURRENT_LIST_DIR}/encoderstrategy.h"
+    "${CMAKE_CURRENT_LIST_DIR}/interface.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/jlscodecfactory.h"
+    "${CMAKE_CURRENT_LIST_DIR}/jpegimagedatasegment.h"
+    "${CMAKE_CURRENT_LIST_DIR}/jpegls.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/jpegmarkercode.h"
+    "${CMAKE_CURRENT_LIST_DIR}/jpegmarkersegment.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/jpegmarkersegment.h"
+    "${CMAKE_CURRENT_LIST_DIR}/jpegsegment.h"
+    "${CMAKE_CURRENT_LIST_DIR}/jpegstreamreader.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/jpegstreamwriter.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/lookuptable.h"
+    "${CMAKE_CURRENT_LIST_DIR}/losslesstraits.h"
+    "${CMAKE_CURRENT_LIST_DIR}/processline.h"
+    "${CMAKE_CURRENT_LIST_DIR}/scan.h"
+    "${CMAKE_CURRENT_LIST_DIR}/util.h"
+)
+
+if(CHARLS_INSTALL)
+  include(GNUInstallDirs)
+
+  install(TARGETS charls
+    CONFIGURATIONS Release
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+  )
+endif()
--- a/src/CharLS.vcxproj
+++ b/src/CharLS.vcxproj
@ -103,7 +103,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>CHARLS_DLL_BUILD;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CHARLS_LIBRARY_BUILD;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <BufferSecurityCheck>true</BufferSecurityCheck>
@ -124,7 +124,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Checked|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>CHARLS_DLL_BUILD;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CHARLS_LIBRARY_BUILD;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <SmallerTypeCheck>false</SmallerTypeCheck>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -150,7 +150,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <OmitFramePointers>true</OmitFramePointers>
      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <PreprocessorDefinitions>CHARLS_DLL_BUILD;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CHARLS_LIBRARY_BUILD;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -172,7 +172,7 @@
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>CHARLS_DLL_BUILD;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CHARLS_LIBRARY_BUILD;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <SmallerTypeCheck>false</SmallerTypeCheck>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -193,7 +193,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>CHARLS_DLL_BUILD;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CHARLS_LIBRARY_BUILD;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <SmallerTypeCheck>false</SmallerTypeCheck>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -219,7 +219,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <OmitFramePointers>true</OmitFramePointers>
      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <PreprocessorDefinitions>CHARLS_DLL_BUILD;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CHARLS_LIBRARY_BUILD;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
--- a/src/interface.cpp
+++ b/src/interface.cpp
@ -94,7 +94,7 @@ ApiResult ResultAndErrorMessageFromException(char* errorMessage)
 } // namespace


-CHARLS_DLL_IMPORT_EXPORT(ApiResult) JpegLsEncodeStream(ByteStreamInfo compressedStreamInfo, size_t& bytesWritten,
+ApiResult JpegLsEncodeStream(ByteStreamInfo compressedStreamInfo, size_t& bytesWritten,
    ByteStreamInfo rawStreamInfo, const struct JlsParameters& params, char* errorMessage)
 {
    try
@ -150,7 +150,7 @@ CHARLS_DLL_IMPORT_EXPORT(ApiResult) JpegLsEncodeStream(ByteStreamInfo compressed
 }


-CHARLS_DLL_IMPORT_EXPORT(ApiResult) JpegLsDecodeStream(ByteStreamInfo rawStream, ByteStreamInfo compressedStream, const JlsParameters* info, char* errorMessage)
+ApiResult JpegLsDecodeStream(ByteStreamInfo rawStream, ByteStreamInfo compressedStream, const JlsParameters* info, char* errorMessage)
 {
    try
    {
@ -172,7 +172,7 @@ CHARLS_DLL_IMPORT_EXPORT(ApiResult) JpegLsDecodeStream(ByteStreamInfo rawStream,
 }


-CHARLS_DLL_IMPORT_EXPORT(ApiResult) JpegLsReadHeaderStream(ByteStreamInfo rawStreamInfo, JlsParameters* params, char* errorMessage)
+ApiResult JpegLsReadHeaderStream(ByteStreamInfo rawStreamInfo, JlsParameters* params, char* errorMessage)
 {
    try
    {
@ -191,7 +191,8 @@ CHARLS_DLL_IMPORT_EXPORT(ApiResult) JpegLsReadHeaderStream(ByteStreamInfo rawStr

 extern "C" {

-CHARLS_DLL_IMPORT_EXPORT(ApiResult) JpegLsEncode(void* destination, size_t destinationLength, size_t* bytesWritten, const void* source, size_t sourceLength, const struct JlsParameters* params, char* errorMessage)
+ApiResult CHARLS_API_CALLING_CONVENTION
+JpegLsEncode(void* destination, size_t destinationLength, size_t* bytesWritten, const void* source, size_t sourceLength, const struct JlsParameters* params, char* errorMessage)
 {
    if (!destination || !bytesWritten || !source || !params)
        return ApiResult::InvalidJlsParameters;
@ -203,13 +204,15 @@ CHARLS_DLL_IMPORT_EXPORT(ApiResult) JpegLsEncode(void* destination, size_t desti
 }


-CHARLS_DLL_IMPORT_EXPORT(ApiResult) JpegLsReadHeader(const void* compressedData, size_t compressedLength, JlsParameters* params, char* errorMessage)
+ApiResult CHARLS_API_CALLING_CONVENTION
+JpegLsReadHeader(const void* compressedData, size_t compressedLength, JlsParameters* params, char* errorMessage)
 {
    return JpegLsReadHeaderStream(FromByteArrayConst(compressedData, compressedLength), params, errorMessage);
 }


-CHARLS_DLL_IMPORT_EXPORT(ApiResult) JpegLsDecode(void* destination, size_t destinationLength, const void* source, size_t sourceLength, const struct JlsParameters* params, char* errorMessage)
+ApiResult CHARLS_API_CALLING_CONVENTION
+JpegLsDecode(void* destination, size_t destinationLength, const void* source, size_t sourceLength, const struct JlsParameters* params, char* errorMessage)
 {
    const ByteStreamInfo compressedStream = FromByteArrayConst(source, sourceLength);
    const ByteStreamInfo rawStreamInfo = FromByteArray(destination, destinationLength);
@ -218,8 +221,9 @@ CHARLS_DLL_IMPORT_EXPORT(ApiResult) JpegLsDecode(void* destination, size_t desti
 }


-CHARLS_DLL_IMPORT_EXPORT(ApiResult) JpegLsDecodeRect(void* uncompressedData, size_t uncompressedLength, const void* compressedData, size_t compressedLength,
-    JlsRect roi, const JlsParameters* info, char* errorMessage)
+ApiResult CHARLS_API_CALLING_CONVENTION
+JpegLsDecodeRect(void* uncompressedData, size_t uncompressedLength, const void* compressedData, size_t compressedLength,
+                 JlsRect roi, const JlsParameters* info, char* errorMessage)
 {
    try
    {
--- a/src/jpegstreamreader.cpp
+++ b/src/jpegstreamreader.cpp
@ -214,7 +214,7 @@ void JpegStreamReader::ValidateMarkerCode(JpegMarkerCode markerCode) const
        case JpegMarkerCode::ApplicationData13:
        case JpegMarkerCode::ApplicationData14:
        case JpegMarkerCode::ApplicationData15:
-            break;
+            return;

        case JpegMarkerCode::StartOfFrameBaselineJpeg:
        case JpegMarkerCode::StartOfFrameExtendedSequential:
@ -242,14 +242,11 @@ void JpegStreamReader::ValidateMarkerCode(JpegMarkerCode markerCode) const
                message << "Invalid JPEG stream, marker " << static_cast<unsigned int>(markerCode) << " invalid in current state.";
                throw charls_error(ApiResult::InvalidCompressedData, message.str());
            }
-
-        default:
-            {
-                std::ostringstream message;
-                message << "Unknown JPEG marker " << static_cast<unsigned int>(markerCode) << " encountered.";
-                throw charls_error(ApiResult::UnknownJpegMarker, message.str());
-            }
    }
+
+    std::ostringstream message;
+    message << "Unknown JPEG marker " << static_cast<unsigned int>(markerCode) << " encountered.";
+    throw charls_error(ApiResult::UnknownJpegMarker, message.str());
 }


--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@ -1,5 +1,22 @@
-# test for charlls
-
-#add_library(CharLS STATIC IMPORTED)
-
-link_directories (..)
+# Copyright (c) Team CharLS. All rights reserved. See the accompanying "LICENSE.md" for licensed use.
+
+add_executable(charlstest "")
+
+target_sources(charlstest
+  PRIVATE
+    bitstreamdamage.cpp
+    bitstreamdamage.h
+    compliance.cpp
+    compliance.h
+    dicomsamples.cpp
+    dicomsamples.h
+    main.cpp
+    performance.cpp
+    performance.h
+    gettime.cpp
+    gettime.h
+    util.cpp
+    util.h
+)
+
+target_link_libraries(charlstest PRIVATE charls)
--- a/test/CharLSTest.vcxproj
+++ b/test/CharLSTest.vcxproj
@ -101,7 +101,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;CHARLS_DLL;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>NotUsing</PrecompiledHeader>
@ -118,7 +118,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Checked|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;CHARLS_DLL;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>NotUsing</PrecompiledHeader>
@ -136,7 +136,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;CHARLS_DLL;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>NotUsing</PrecompiledHeader>
@ -152,7 +152,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;CHARLS_DLL;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>NotUsing</PrecompiledHeader>
@ -170,7 +170,7 @@
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
      <OmitFramePointers>true</OmitFramePointers>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;CHARLS_DLL;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@ -191,7 +191,7 @@
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
      <OmitFramePointers>true</OmitFramePointers>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;CHARLS_DLL;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@ -580,6 +580,4 @@
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
 </Project>
--- a/test/dicomsamples.cpp
+++ b/test/dicomsamples.cpp
@ -7,9 +7,6 @@
 #include <vector>
 #include <array>

-#define COUNT(x) (sizeof(x)/sizeof((x)[0]))
-
-
 namespace
 {