diff --git a/CMakeLists.txt b/CMakeLists.txt index 97ae3ff..9074777 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,10 +12,10 @@ option(LIBICSNEO_BUILD_DOCS "Build documentation. Don't use in Visual Studio." O option(LIBICSNEO_BUILD_EXAMPLES "Build examples." ON) option(LIBICSNEO_BUILD_ICSNEO "Build dynamic C library" ON) option(LIBICSNEO_BUILD_ICSNEO_STATIC "Build static C library" ON) -option(LIBICSNEO_BUILD_ICSNEOC "Build dynamic C legacy library" ON) -option(LIBICSNEO_BUILD_ICSNEOC_STATIC "Build static C legacy library" ON) -option(LIBICSNEO_BUILD_ICSNEOLEGACY "Build icsnVC40 compatibility library" ON) -option(LIBICSNEO_BUILD_ICSNEOLEGACY_STATIC "Build static icsnVC40 compatibility library" ON) +option(LIBICSNEO_BUILD_ICSNEOC "Build dynamic C legacy library" OFF) +option(LIBICSNEO_BUILD_ICSNEOC_STATIC "Build static C legacy library" OFF) +option(LIBICSNEO_BUILD_ICSNEOLEGACY "Build icsnVC40 compatibility library" OFF) +option(LIBICSNEO_BUILD_ICSNEOLEGACY_STATIC "Build static icsnVC40 compatibility library" OFF) set(LIBICSNEO_NPCAP_INCLUDE_DIR "" CACHE STRING "Npcap include directory; set to build with Npcap") # Device Drivers @@ -437,7 +437,6 @@ endif(LIBICSNEO_ENABLE_RAW_ETHERNET) if(LIBICSNEO_BUILD_ICSNEO) add_library(icsneo SHARED api/icsneo/icsneo.cpp ${CMAKE_CURRENT_BINARY_DIR}/generated/icsneo/version.rc) - target_include_directories(icsneo PUBLIC $ @@ -446,7 +445,14 @@ if(LIBICSNEO_BUILD_ICSNEO) ${CMAKE_CURRENT_SOURCE_DIR}/include ) target_link_libraries(icsneo PRIVATE icsneocpp) - target_compile_definitions(icsneo PRIVATE ICSNEO_EXPORTS) + target_compile_definitions(icsneo + PRIVATE + ICSNEO_EXPORTS _CRT_SECURE_NO_WARNINGS + PUBLIC + ICSNEO_IMPORTS _CRT_SECURE_NO_WARNINGS + INTERFACE + ICSNEO_IMPORTS _CRT_SECURE_NO_WARNINGS + ) target_compile_features(icsneo PRIVATE cxx_auto_type cxx_constexpr cxx_lambdas cxx_nullptr cxx_range_for cxx_rvalue_references cxx_sizeof_member cxx_strong_enums) endif() @@ -461,8 +467,7 @@ if(LIBICSNEO_BUILD_ICSNEO_STATIC) ) target_link_libraries(icsneo-static PUBLIC icsneocpp) target_compile_features(icsneo-static PUBLIC cxx_auto_type cxx_constexpr cxx_lambdas cxx_nullptr cxx_range_for cxx_rvalue_references cxx_sizeof_member cxx_strong_enums) - target_compile_definitions(icsneo PRIVATE ICSNEO_EXPORTS) - target_compile_definitions(icsneo-static PUBLIC ICSNEOC_BUILD_STATIC) + target_compile_definitions(icsneo-static PUBLIC ICSNEO_BUILD_STATIC) endif() diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 800349c..003eb9d 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,7 +1,7 @@ option(LIBICSNEO_BUILD_C_SIMPLE_EXAMPLE "Build the command-line simple C example." ON) -option(LIBICSNEO_BUILD_C_LEGACY_INTERACTIVE_EXAMPLE "Build the command-line interactive C example." ON) -option(LIBICSNEO_BUILD_C_LEGACY_SIMPLE_EXAMPLE "Build the command-line simple C example." ON) -option(LIBICSNEO_BUILD_C_LEGACY_LEGACY_EXAMPLE "Build the command-line simple C example." ON) +option(LIBICSNEO_BUILD_C_LEGACY_INTERACTIVE_EXAMPLE "Build the command-line interactive C example." OFF) +option(LIBICSNEO_BUILD_C_LEGACY_SIMPLE_EXAMPLE "Build the command-line simple C example." OFF) +option(LIBICSNEO_BUILD_C_LEGACY_LEGACY_EXAMPLE "Build the command-line simple C example." OFF) option(LIBICSNEO_BUILD_CPP_SIMPLE_EXAMPLE "Build the simple C++ example." ON) option(LIBICSNEO_BUILD_CPP_INTERACTIVE_EXAMPLE "Build the command-line interactive C++ example." ON) option(LIBICSNEO_BUILD_CPP_A2B_EXAMPLE "Build the A2B example." ON) diff --git a/examples/c/simple/CMakeLists.txt b/examples/c/simple/CMakeLists.txt index 36ed1b5..c07ee4f 100644 --- a/examples/c/simple/CMakeLists.txt +++ b/examples/c/simple/CMakeLists.txt @@ -1,5 +1,2 @@ add_executable(libicsneo-simple-example src/main.c) -if(UNIX) - target_link_libraries(libicsneo-simple-example ${CMAKE_DL_LIBS}) -endif() -target_link_libraries(libicsneo-simple-example icsneo) \ No newline at end of file +target_link_libraries(libicsneo-simple-example icsneo)