Skip to content

Avoid exit symbol in library #180

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
merged 4 commits into from
May 18, 2020
Merged

Avoid exit symbol in library #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a3c3e5
cmake/FindCPPCHECK.cmake: enforce the REQUIRED flag passed to find_pa…
ao2 May 16, 2020
49e9b90
test_sparse_array: don't put main() in a namespace, fix a linking error
ao2 May 16, 2020
293b305
jp2: split executable modules from library code
ao2 May 16, 2020
34a0d28
jp2: add t1_generate_luts.cpp to GROK_EXECUTABLES_SRCS to run cppchec…
ao2 May 16, 2020
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
6 changes: 6 additions & 0 deletions cmake/FindCPPCHECK.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
find_program(CPPCHECK_EXECUTABLE cppcheck )
mark_as_advanced( CPPCHECK_EXECUTABLE )

if (NOT CPPCHECK_EXECUTABLE)
if (CPPCHECK_FIND_REQUIRED)
message(FATAL_ERROR "ERROR: Could not find cppcheck")
endif ()
endif ()
20 changes: 13 additions & 7 deletions src/lib/jp2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,16 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/mct
${CMAKE_CURRENT_SOURCE_DIR}/t2
)
# Defines the source code for the library
set(GROK_SRCS

# Defines the source code for executables
set(GROK_EXECUTABLES_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/util/test_sparse_array.cpp
${CMAKE_CURRENT_SOURCE_DIR}/util/bench_dwt.cpp
${CMAKE_CURRENT_SOURCE_DIR}/t1/t1_part1/t1_generate_luts.cpp
)

# Defines the source code for the library
set(GROK_LIBRARY_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/util/BufferedStream.cpp
${CMAKE_CURRENT_SOURCE_DIR}/util/BufferedStream.h
${CMAKE_CURRENT_SOURCE_DIR}/util/IBufferedStream.h
Expand Down Expand Up @@ -196,17 +202,17 @@ if(WIN32)
else()
add_definitions(-DGRK_STATIC)
endif()
add_library(${GROK_LIBRARY_NAME} ${GROK_SRCS})
add_library(${GROK_LIBRARY_NAME} ${GROK_LIBRARY_SRCS})
set(INSTALL_LIBS ${GROK_LIBRARY_NAME})
else()
if(BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS)
# Builds both static and dynamic libs, and install static version
add_library(${GROK_LIBRARY_NAME} SHARED ${GROK_SRCS})
add_library(${GROK_LIBRARY_NAME}_static STATIC ${GROK_SRCS})
add_library(${GROK_LIBRARY_NAME} SHARED ${GROK_LIBRARY_SRCS})
add_library(${GROK_LIBRARY_NAME}_static STATIC ${GROK_LIBRARY_SRCS})
set_target_properties(${GROK_LIBRARY_NAME}_static PROPERTIES OUTPUT_NAME ${GROK_LIBRARY_NAME})
set(INSTALL_LIBS ${GROK_LIBRARY_NAME} ${GROK_LIBRARY_NAME}_static)
else()
add_library(${GROK_LIBRARY_NAME} ${GROK_SRCS})
add_library(${GROK_LIBRARY_NAME} ${GROK_LIBRARY_SRCS})
set(INSTALL_LIBS ${GROK_LIBRARY_NAME})
endif()
endif()
Expand Down Expand Up @@ -257,7 +263,7 @@ endif()
# warning regex to catch them.
if(GROK_CPPCHECK)
find_package(CPPCHECK REQUIRED)
foreach(f ${GROK_SRCS})
foreach(f ${GROK_EXECUTABLES_SRCS} ${GROK_LIBRARY_SRCS})
# cppcheck complains about too many configuration, pretend to be WIN32:
add_custom_command(TARGET ${GROK_LIBRARY_NAME}
COMMAND ${CPPCHECK_EXECUTABLE} -DWIN32 ${f})
Expand Down
4 changes: 0 additions & 4 deletions src/lib/jp2/util/test_sparse_array.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@

#include "grok_includes.h"

namespace grk {

int main()
{
uint32_t i, j, w, h;
Expand Down Expand Up @@ -217,5 +215,3 @@ int main()

return 0;
}

}