Skip to content

Better command line interface #128

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.

Sign up for GitHub

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

Merged
wonder-sk merged 1 commit into from
May 24, 2021
Merged

Better command line interface #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions geodiff/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ IF (POSTGRES_FOUND)
)
ENDIF()

IF ( ENABLE_TESTS )
IF (ENABLE_TESTS OR BUILD_TOOLS)
# tests need statically built library in order to use symbols that are not exported
SET ( BUILD_STATIC TRUE )
ENDIF ()
Expand All @@ -185,14 +185,15 @@ ENDIF (NOT WIN32 AND NOT ANDROID AND NOT IOS)

# command line tool
IF (BUILD_TOOLS)
ADD_EXECUTABLE(geodiffinfo src/geodiffinfo.cpp)
TARGET_LINK_LIBRARIES(geodiffinfo PUBLIC geodiff )
ADD_EXECUTABLE(geodiff-cli src/geodiff-cli.cpp)
TARGET_LINK_LIBRARIES(geodiff-cli PUBLIC ${GEODIFF_NAME}_a )
SET_TARGET_PROPERTIES(geodiff-cli PROPERTIES OUTPUT_NAME geodiff)
ENDIF (BUILD_TOOLS)

ADD_DEFINITIONS( -DSQLITE_CORE )
TARGET_LINK_LIBRARIES(${GEODIFF_NAME} PUBLIC ${SQLite3_LIBRARIES})
IF (BUILD_TOOLS)
TARGET_LINK_LIBRARIES(geodiffinfo PUBLIC ${SQLite3_LIBRARIES} )
TARGET_LINK_LIBRARIES(geodiff-cli PUBLIC ${SQLite3_LIBRARIES} )
ENDIF (BUILD_TOOLS)

TARGET_INCLUDE_DIRECTORIES(${GEODIFF_NAME} PRIVATE ${libgpkg_dir}/gpkg)
Expand All @@ -206,6 +207,7 @@ IF (POSTGRES_FOUND)
IF ( BUILD_STATIC )
TARGET_INCLUDE_DIRECTORIES(${GEODIFF_NAME}_a PRIVATE ${POSTGRES_INCLUDE_DIR})
ENDIF ()
TARGET_LINK_LIBRARIES(geodiff-cli PUBLIC ${POSTGRES_LIBRARY})
ENDIF ()

# win32 libs
Expand Down
2 changes: 1 addition & 1 deletion geodiff/src/drivers/sqlitedriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ void SqliteDriver::open( const DriverParametersMap &conn )

if ( !fileexists( modified ) )
{
throw GeoDiffException( "Missing 'modified' file when opening sqlite driver: " + base );
throw GeoDiffException( "Missing 'modified' file when opening sqlite driver: " + modified );
}

mDb->open( modified );
Expand Down
Loading