Skip to content
Merged
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
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ else()
LANGUAGES CXX) # no CUDA
endif()
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_STATIC_LIBRARY_PREFIX "lib")
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
add_definitions(-D_HAS_AUTO_PTR_ETC)
Expand Down
1 change: 1 addition & 0 deletions HostSupport/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ if(NOT MSVC)
set_target_properties(OfxHost PROPERTIES COMPILE_FLAGS "-fPIC")
endif()

target_compile_features(OfxHost PUBLIC cxx_std_17)
target_link_libraries(OfxHost PUBLIC expat::expat)

target_include_directories(OfxHost PUBLIC
Expand Down
1 change: 1 addition & 0 deletions Support/Library/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ add_library(OfxSupport STATIC
${OFX_SUPPORT_HEADER_FILES}
${OFX_SUPPORT_LIBRARY_FILES})

target_compile_features(OfxSupport PUBLIC cxx_std_17)
set_target_properties(OfxSupport PROPERTIES LINKER_LANGUAGE CXX)
if(NOT MSVC)
set_target_properties(OfxSupport PROPERTIES COMPILE_FLAGS "-fPIC")
Expand Down
1 change: 1 addition & 0 deletions cmake/OpenFX.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ function(add_ofx_plugin TARGET)
add_library(${TARGET} SHARED) # build as shared lib/DLL
endif()
set_target_properties(${TARGET} PROPERTIES SUFFIX ".ofx" PREFIX "")
target_compile_features(${TARGET} PRIVATE cxx_std_17)

set(PLUGIN_NAME ${TARGET})
set(PLUGIN_EXE ${TARGET}.ofx)
Expand Down
3 changes: 1 addition & 2 deletions test_package/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
cmake_minimum_required(VERSION 3.15)
project(PackageTest CXX)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

find_package(openfx CONFIG REQUIRED)
Expand All @@ -13,4 +12,4 @@ file(GLOB_RECURSE PLUGIN_SOURCES "../Support/Plugins/Invert/*.cpp")
add_ofx_plugin(invert_plugin ../Support/Plugins/Invert)
target_sources(invert_plugin PUBLIC ${PLUGIN_SOURCES})
target_include_directories(invert_plugin PUBLIC ${openfx_INCLUDE_DIRS})
target_link_libraries(invert_plugin openfx::Support)
target_link_libraries(invert_plugin openfx::Support)
Loading