mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-02-11 16:40:36 +08:00
removing need for global compile definition
This commit is contained in:
parent
64cb40424c
commit
76f5a08f23
@ -468,8 +468,8 @@ if(WIN32)
|
|||||||
option(ENABLE_DLL "Build a Windows DLL." ${BUILD_SHARED_LIBS})
|
option(ENABLE_DLL "Build a Windows DLL." ${BUILD_SHARED_LIBS})
|
||||||
if(ENABLE_DLL)
|
if(ENABLE_DLL)
|
||||||
set(BUILD_DLL ON CACHE BOOL "")
|
set(BUILD_DLL ON CACHE BOOL "")
|
||||||
ADD_DEFINITIONS(-DDLL_NETCDF -DDLL_EXPORT)
|
target_compile_definitions(netcdf PRIVATE DLL_EXPORT)
|
||||||
target_compile_definitions(netcdf PRIVATE DLL_NETCDF DLL_EXPORT)
|
target_compile_definitions(netcdf PUBLIC DLL_NETCDF)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
# Did the user specify a default minimum blocksize for posixio?
|
# Did the user specify a default minimum blocksize for posixio?
|
||||||
@ -1478,22 +1478,10 @@ endif()
|
|||||||
|
|
||||||
add_subdirectory(liblib)
|
add_subdirectory(liblib)
|
||||||
|
|
||||||
# For tests and utilities, we are no longer
|
|
||||||
# exporting symbols but rather importing them.
|
|
||||||
if(BUILD_DLL)
|
|
||||||
REMOVE_DEFINITIONS(-DDLL_EXPORT)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(ENABLE_PLUGINS)
|
if(ENABLE_PLUGINS)
|
||||||
add_subdirectory(plugins)
|
add_subdirectory(plugins)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# For tests and utilities, we are no longer
|
|
||||||
# exporting symbols but rather importing them.
|
|
||||||
if(BUILD_DLL)
|
|
||||||
REMOVE_DEFINITIONS(-DDLL_EXPORT)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Enable Utilities.
|
# Enable Utilities.
|
||||||
if(BUILD_UTILITIES)
|
if(BUILD_UTILITIES)
|
||||||
include_directories(ncdump)
|
include_directories(ncdump)
|
||||||
|
Loading…
Reference in New Issue
Block a user