Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
5 changes: 2 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
cmake_minimum_required(VERSION 3.14)
project(nitro)

set(CMAKE_CXX_STANDARD 14)
set(CXX_STANDARD_REQUIRED true)

if (${CMAKE_PROJECT_NAME} STREQUAL nitro)
# we are the top-level project and are responsible for configuration
set(CMAKE_CXX_STANDARD 14)
set(CXX_STANDARD_REQUIRED true)

# Always turn on "warnings as errors" to avoid lots of (meaningless?) build output;
# we'll dial-back warnings as necessary.
Expand Down
7 changes: 4 additions & 3 deletions externals/coda-oss/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
cmake_minimum_required(VERSION 3.14)
project(coda-oss)

set(CMAKE_CXX_STANDARD 14)
set(CXX_STANDARD_REQUIRED true)

if (EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
# build and package with conan
include("${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
Expand All @@ -19,6 +16,10 @@ endif()
if (${CMAKE_PROJECT_NAME} STREQUAL coda-oss)
# this is the top level project

# Allow other project to set different standard.
set(CMAKE_CXX_STANDARD 14)
set(CXX_STANDARD_REQUIRED true)

# Always turn on "warnings as errors" to avoid lots of (meaningless?) build output;
# we'll dial-back warnings as necessary.
if (MSVC)
Expand Down
2 changes: 1 addition & 1 deletion modules/c/j2k/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ foreach(j2k_shared ${j2k_shared_srcs})
set_target_properties(${j2k_shared} PROPERTIES PREFIX "")
endforeach()

install(TARGETS ${j2k_shared_srcs} DESTINATION "share/nitf/plugins")
install(TARGETS ${j2k_shared_srcs} DESTINATION "share/nitf/plugins" OPTIONAL)
10 changes: 8 additions & 2 deletions modules/c/nitf/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ set(tre_srcs ACCHZB
CLCTNA
CLCTNB
CMETAA
CSATTB
CSCCGA
CSCRNA
CSDIDA
Expand Down Expand Up @@ -173,6 +174,7 @@ set(tre_srcs ACCHZB
RSMPCA
RSMPIA
SECTGA
SECURA
SENSRA
SENSRB
SNSPSB
Expand Down Expand Up @@ -206,8 +208,12 @@ foreach(tre ${tre_srcs})
install(TARGETS ${tre_static}
EXPORT ${CODA_EXPORT_SET_NAME}
LIBRARY DESTINATION "lib"
ARCHIVE DESTINATION "lib")
ARCHIVE DESTINATION "lib"
OPTIONAL)
endif()
endforeach()

install(TARGETS ${tre_srcs} DESTINATION "share/nitf/plugins")
install(TARGETS ${tre_srcs} DESTINATION "share/nitf/plugins" OPTIONAL)

add_custom_target(nitro-plugins)
add_dependencies(nitro-plugins ${tre_srcs})