Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch from XML to CSV #500

Merged
merged 8 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
removed commented out lines
  • Loading branch information
AlysonStahl-NOAA committed Aug 8, 2024
commit fa90033af721f0d96a1dfbd45d89d31abbe333f6
5 changes: 0 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,6 @@ else()
message(STATUS "Will not build AEC support")
endif()

# Find libxml2.
#if(BUILD_G2C)
# find_package(LibXml2 2.9.0 REQUIRED)
#endif()

# Set the compiler flags.
if(CMAKE_C_COMPILER_ID MATCHES "^(Intel|IntelLLVM)$")
set(CMAKE_C_FLAGS "-g -traceback ${CMAKE_C_FLAGS}")
Expand Down
17 changes: 0 additions & 17 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,23 +49,6 @@ if(BUILD_SHARED_LIBS)
list(APPEND LIB_TARGETS ${lib_name}_shared)
endif()

# Link to libxml2.
#[===[
if(BUILD_G2C)
message(STATUS "libxml2 include directories ${LIBXML2_INCLUDE_DIR}")
target_link_libraries(${lib_name}_objlib PRIVATE ${LIBXML2_LIBRARIES})
target_include_directories(${lib_name}_objlib PRIVATE "${LIBXML2_INCLUDE_DIR}")
if(BUILD_SHARED_LIBS)
target_link_libraries(${lib_name}_shared PRIVATE ${LIBXML2_LIBRARIES})
target_include_directories(${lib_name}_shared PRIVATE "${LIBXML2_INCLUDE_DIR}")
endif()
if(BUILD_STATIC_LIBS)
target_link_libraries(${lib_name}_static PRIVATE ${LIBXML2_LIBRARIES})
target_include_directories(${lib_name}_static PRIVATE "${LIBXML2_INCLUDE_DIR}")
endif()
endif()
]===]

# Build with PNG.
if(PNG_FOUND)
message(STATUS "PNG include directories ${PNG_INCLUDE_DIR}")
Expand Down
6 changes: 0 additions & 6 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,12 @@ endif()
function(g2c_build_test name)
add_executable(${name} ${name}.c g2c_test_util.c)
target_link_libraries(${name} PUBLIC g2c::g2c)
#if(BUILD_G2C)
# target_link_libraries(${name} PRIVATE ${LIBXML2_LIBRARIES})
# target_include_directories(${name} PRIVATE "${LIBXML2_INCLUDE_DIR}")
#endif()
endfunction()

# Build a C program test.
function(g2c_build_test name)
add_executable(${name} ${name}.c g2c_test_util.c)
target_link_libraries(${name} PUBLIC g2c::g2c)
#target_link_libraries(${name} PRIVATE ${LIBXML2_LIBRARIES})
#target_include_directories(${name} PRIVATE "${LIBXML2_INCLUDE_DIR}")
endfunction()

# Run a C program test.
Expand Down
Loading