diff --git a/ANSIO/CMakeLists.txt b/ANSIO/CMakeLists.txt index 0833ddf..77569e3 100644 --- a/ANSIO/CMakeLists.txt +++ b/ANSIO/CMakeLists.txt @@ -29,10 +29,18 @@ target_link_libraries(ANSIO PRIVATE labview ) -target_compile_definitions(ANSIO PRIVATE UNICODE _UNICODE ANSIO_EXPORTS _USRDLL) +target_compile_definitions(ANSIO PRIVATE UNICODE _UNICODE NOMINMAX ANSIO_EXPORTS _USRDLL) if(WIN32) target_link_libraries(ANSIO PRIVATE ${WIN_COMMON_LIBS}) else() target_link_libraries(ANSIO PRIVATE ${UNIX_COMMON_LIBS}) endif() + +# C files must skip C++ precompiled headers and compile as C +set_source_files_properties( + IOBox/cJSON.c IOBox/cJSON_Utils.c + IOBox/mbedtls/aes.c IOBox/mbedtls/base64.c IOBox/mbedtls/sha256.c + PROPERTIES SKIP_PRECOMPILE_HEADERS ON LANGUAGE C +) + target_precompile_headers(ANSIO PRIVATE pch.h) diff --git a/ANSIO/pch.h b/ANSIO/pch.h index 48146e6..dc348fc 100644 --- a/ANSIO/pch.h +++ b/ANSIO/pch.h @@ -9,10 +9,14 @@ // add headers that you want to pre-compile here #include "framework.h" +#include #include #include #include #include #include +using std::min; +using std::max; + #endif //PCH_H diff --git a/ANSLIB/CMakeLists.txt b/ANSLIB/CMakeLists.txt index 83a400e..f4c1810 100644 --- a/ANSLIB/CMakeLists.txt +++ b/ANSLIB/CMakeLists.txt @@ -15,6 +15,7 @@ target_include_directories(ANSLIB PUBLIC target_link_libraries(ANSLIB PUBLIC ANSLibsLoader + PUBLIC ANSLicensingSystem PUBLIC opencv # The facade links against all modules PRIVATE ANSODEngine diff --git a/ANSLLM/CMakeLists.txt b/ANSLLM/CMakeLists.txt index bde13a1..8deac32 100644 --- a/ANSLLM/CMakeLists.txt +++ b/ANSLLM/CMakeLists.txt @@ -22,5 +22,9 @@ target_link_libraries(ANSLLM PRIVATE boost ) +if(WIN32) + target_link_libraries(ANSLLM PRIVATE ${WIN_COMMON_LIBS} crypt32) +endif() + target_compile_definitions(ANSLLM PRIVATE UNICODE _UNICODE ANSLLM_EXPORTS _USRDLL) target_precompile_headers(ANSLLM PRIVATE pch.h) diff --git a/ANSUtilities/CMakeLists.txt b/ANSUtilities/CMakeLists.txt index 92df06a..3f341a5 100644 --- a/ANSUtilities/CMakeLists.txt +++ b/ANSUtilities/CMakeLists.txt @@ -15,9 +15,14 @@ target_include_directories(ANSUtilities PUBLIC target_link_libraries(ANSUtilities PRIVATE ANSLicensingSystem + PRIVATE labview PRIVATE opencv PRIVATE chilkat ) +if(WIN32) + target_link_libraries(ANSUtilities PRIVATE ${WIN_COMMON_LIBS} crypt32) +endif() + target_compile_definitions(ANSUtilities PRIVATE UNICODE _UNICODE ANSUTILITIES_EXPORTS) target_precompile_headers(ANSUtilities PRIVATE pch.h) diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index 7814a2c..c269bdf 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -239,7 +239,7 @@ endif() add_library(chilkat INTERFACE) if(WIN32) set(CHILKAT_INCLUDE_DIR "${RESEARCH_DIR}/chilkat/include") - set(CHILKAT_LIB_DIR "${RESEARCH_DIR}/chilkat/lib") + set(CHILKAT_LIB_DIR "${RESEARCH_DIR}/chilkat/libs") target_include_directories(chilkat INTERFACE ${CHILKAT_INCLUDE_DIR}) target_link_directories(chilkat INTERFACE ${CHILKAT_LIB_DIR}) target_link_libraries(chilkat INTERFACE ChilkatRel_x64.lib)