Complete all builds
This commit is contained in:
@@ -29,10 +29,18 @@ target_link_libraries(ANSIO
|
|||||||
PRIVATE labview
|
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)
|
if(WIN32)
|
||||||
target_link_libraries(ANSIO PRIVATE ${WIN_COMMON_LIBS})
|
target_link_libraries(ANSIO PRIVATE ${WIN_COMMON_LIBS})
|
||||||
else()
|
else()
|
||||||
target_link_libraries(ANSIO PRIVATE ${UNIX_COMMON_LIBS})
|
target_link_libraries(ANSIO PRIVATE ${UNIX_COMMON_LIBS})
|
||||||
endif()
|
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)
|
target_precompile_headers(ANSIO PRIVATE pch.h)
|
||||||
|
|||||||
@@ -9,10 +9,14 @@
|
|||||||
|
|
||||||
// add headers that you want to pre-compile here
|
// add headers that you want to pre-compile here
|
||||||
#include "framework.h"
|
#include "framework.h"
|
||||||
|
#include <algorithm>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <string_view>
|
#include <string_view>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
|
|
||||||
|
using std::min;
|
||||||
|
using std::max;
|
||||||
|
|
||||||
#endif //PCH_H
|
#endif //PCH_H
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ target_include_directories(ANSLIB PUBLIC
|
|||||||
|
|
||||||
target_link_libraries(ANSLIB
|
target_link_libraries(ANSLIB
|
||||||
PUBLIC ANSLibsLoader
|
PUBLIC ANSLibsLoader
|
||||||
|
PUBLIC ANSLicensingSystem
|
||||||
PUBLIC opencv
|
PUBLIC opencv
|
||||||
# The facade links against all modules
|
# The facade links against all modules
|
||||||
PRIVATE ANSODEngine
|
PRIVATE ANSODEngine
|
||||||
|
|||||||
@@ -22,5 +22,9 @@ target_link_libraries(ANSLLM
|
|||||||
PRIVATE boost
|
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_compile_definitions(ANSLLM PRIVATE UNICODE _UNICODE ANSLLM_EXPORTS _USRDLL)
|
||||||
target_precompile_headers(ANSLLM PRIVATE pch.h)
|
target_precompile_headers(ANSLLM PRIVATE pch.h)
|
||||||
|
|||||||
@@ -15,9 +15,14 @@ target_include_directories(ANSUtilities PUBLIC
|
|||||||
|
|
||||||
target_link_libraries(ANSUtilities
|
target_link_libraries(ANSUtilities
|
||||||
PRIVATE ANSLicensingSystem
|
PRIVATE ANSLicensingSystem
|
||||||
|
PRIVATE labview
|
||||||
PRIVATE opencv
|
PRIVATE opencv
|
||||||
PRIVATE chilkat
|
PRIVATE chilkat
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if(WIN32)
|
||||||
|
target_link_libraries(ANSUtilities PRIVATE ${WIN_COMMON_LIBS} crypt32)
|
||||||
|
endif()
|
||||||
|
|
||||||
target_compile_definitions(ANSUtilities PRIVATE UNICODE _UNICODE ANSUTILITIES_EXPORTS)
|
target_compile_definitions(ANSUtilities PRIVATE UNICODE _UNICODE ANSUTILITIES_EXPORTS)
|
||||||
target_precompile_headers(ANSUtilities PRIVATE pch.h)
|
target_precompile_headers(ANSUtilities PRIVATE pch.h)
|
||||||
|
|||||||
@@ -239,7 +239,7 @@ endif()
|
|||||||
add_library(chilkat INTERFACE)
|
add_library(chilkat INTERFACE)
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set(CHILKAT_INCLUDE_DIR "${RESEARCH_DIR}/chilkat/include")
|
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_include_directories(chilkat INTERFACE ${CHILKAT_INCLUDE_DIR})
|
||||||
target_link_directories(chilkat INTERFACE ${CHILKAT_LIB_DIR})
|
target_link_directories(chilkat INTERFACE ${CHILKAT_LIB_DIR})
|
||||||
target_link_libraries(chilkat INTERFACE ChilkatRel_x64.lib)
|
target_link_libraries(chilkat INTERFACE ChilkatRel_x64.lib)
|
||||||
|
|||||||
Reference in New Issue
Block a user