mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'qPCR4vir-develop' into develop

Browse Source
This commit is contained in:
Jinhao 2019-05-24 02:14:21 +08:00
commit eb4b8d4b89
3 changed files with 39 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
CMakeLists.txt
View File

@ -54,27 +54,25 @@ target_compile_features(nana
# in your own CMakeLists.txt, and them : # in your own CMakeLists.txt, and them :
# target_link_libraries(yourApp PRIVATE nana ) # target_link_libraries(yourApp PRIVATE nana )
set(NANA_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/source) set(NANA_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/source)
set(NANA_SOURCE_SUBDIRS /.
set(NANA_SOURCE_SUBDIRS /detail
/. /detail/posix
/detail /filesystem
/detail/posix /gui
/filesystem /gui/detail
/gui /gui/widgets
/gui/detail /gui/widgets/skeletons
/gui/widgets /paint
/gui/widgets/skeletons /paint/detail
/paint /system
/paint/detail /threads
/system )
/threads
)
if(NANA_CMAKE_ENABLE_AUDIO) if(NANA_CMAKE_ENABLE_AUDIO)
list(APPEND NANA_SOURCE_SUBDIRS list(APPEND NANA_SOURCE_SUBDIRS
/audio /audio
/audio/detail /audio/detail
) )
endif() endif()
# collect all source files in the source-sub-dir # collect all source files in the source-sub-dir
@ -87,26 +85,24 @@ target_sources(nana PRIVATE ${SOURCES})
### collect all headers sub-directories in a list to avoid duplication ### ### collect all headers sub-directories in a list to avoid duplication ###
# To show .h files in Visual Studio, add them to the list of sources in add_executable / add_library / target_sources # To show .h files in Visual Studio, add them to the list of sources in add_executable / add_library / target_sources
# and Use SOURCE_GROUP if all your sources are in the same directory # and Use SOURCE_GROUP if all your sources are in the same directory
set(NANA_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/include) set(NANA_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/include)
set(NANA_INCLUDE_SUBDIRS /.
set(NANA_INCLUDE_SUBDIRS /filesystem
/. /gui
/filesystem /gui/detail
/gui /gui/widgets
/gui/detail /gui/widgets/skeletons
/gui/widgets /paint
/gui/widgets/skeletons /paint/detail
/paint /pat
/paint/detail /system
/pat /threads
/system )
/threads
)
if(NANA_CMAKE_ENABLE_AUDIO) if(NANA_CMAKE_ENABLE_AUDIO)
list(APPEND NANA_INCLUDE_SUBDIRS list(APPEND NANA_INCLUDE_SUBDIRS
/audio /audio
/audio/detail /audio/detail
) )
endif() endif()
foreach(subdir ${NANA_INCLUDE_SUBDIRS}) foreach(subdir ${NANA_INCLUDE_SUBDIRS})

9
build/cmake/select_filesystem.cmake
View File

@ -1,11 +1,12 @@
# The ISO C++ File System Technical Specification (ISO-TS, or STD) is optional. # The ISO C++ File System Technical Specification (ISO-TS, or STD) was optional.
# http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4100.pdf # http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4100.pdf
# This is not a workaround, but an user option. # It is part of c++17.
# The library maybe available in the std library in use or from Boost (almost compatible) # The library may be not available or working correctly in the std library in use. As a workaround we may try
# to "implement" it (ab)using Boost (almost compatible)
# http://www.boost.org/doc/libs/1_60_0/libs/filesystem/doc/index.htm # http://www.boost.org/doc/libs/1_60_0/libs/filesystem/doc/index.htm
# or you can choose to use the (partial, but functional) implementation provided by nana. # or you can choose to use the (partial, but functional) implementation provided by nana.
# If you include the file <nana/filesystem/filesystem.hpp> or <nana/filesystem/filesystem_ext.hpp> # If you include the file <nana/filesystem/filesystem.hpp> or <nana/filesystem/filesystem_ext.hpp>
# the selected option will be set by nana into std::experimental::filesystem # the selected option will be set by nana into std::filesystem
# By default Nana will try to use the STD. If STD is not available and NANA_CMAKE_FIND_BOOST_FILESYSTEM # By default Nana will try to use the STD. If STD is not available and NANA_CMAKE_FIND_BOOST_FILESYSTEM
# is set to ON nana will try to use boost if available. Nana own implementation will be use if none of # is set to ON nana will try to use boost if available. Nana own implementation will be use if none of
# the previus were selected or available. # the previus were selected or available.

7
build/cmake/shared_libs.cmake
View File

@ -40,12 +40,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") # AN
if(BUILD_SHARED_LIBS) if(BUILD_SHARED_LIBS)
target_compile_options(nana PUBLIC -lgcc -lstdc++) target_compile_options(nana PUBLIC -lgcc -lstdc++)
else() else()
target_link_libraries(nana PUBLIC -static -static-libstdc++)
if(MINGW)
target_compile_options(nana PUBLIC -static) # -static ?? cmake knows BUILD_SHARED_LIBS
else()
target_compile_options(nana PUBLIC -static-libgcc -static-libstdc++)
endif()
endif(BUILD_SHARED_LIBS) endif(BUILD_SHARED_LIBS)
endif() endif()