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

Fix build after rebase.

Browse Source
This commit is contained in:
King_DuckZ 2017-11-10 00:16:50 +00:00
parent 309a95d321
commit 32e6ee532c
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -82,7 +82,11 @@ foreach(subdir ${NANA_SOURCE_SUBDIRS})
# message("Subir: ${subdir}") # message("Files: ${sources}") # message("Subir: ${subdir}") # message("Files: ${sources}")
endforeach(subdir ${NANA_SOURCE_SUBDIRS}) endforeach(subdir ${NANA_SOURCE_SUBDIRS})
add_library(${PROJECT_NAME} ${sources} ) if(NANA_CMAKE_SHARED_LIB)
add_library(${PROJECT_NAME} SHARED ${sources} )
else()
add_library(${PROJECT_NAME} STATIC ${sources} )
endif(NANA_CMAKE_SHARED_LIB)
########### OS ########### OS
if(WIN32) if(WIN32)
@ -196,8 +200,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") # AN
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
target_link_libraries(${PROJECT_NAME} PRIVATE Threads::Threads) target_link_libraries(${PROJECT_NAME} PRIVATE Threads::Threads)
if(NANA_CMAKE_SHARED_LIB) if(NOT NANA_CMAKE_SHARED_LIB)
else()
set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++") set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
endif(NANA_CMAKE_SHARED_LIB) endif(NANA_CMAKE_SHARED_LIB)
@ -302,12 +305,6 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
add_definitions(-fmax-errors=3) add_definitions(-fmax-errors=3)
endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
if(NANA_CMAKE_SHARED_LIB)
add_library(${PROJECT_NAME} SHARED ${sources} )
else()
add_library(${PROJECT_NAME} STATIC ${sources} )
endif(NANA_CMAKE_SHARED_LIB)
target_include_directories(${PROJECT_NAME} PUBLIC ${NANA_INCLUDE_DIR}) target_include_directories(${PROJECT_NAME} PUBLIC ${NANA_INCLUDE_DIR})
# Headers: use INCLUDE_DIRECTORIES # Headers: use INCLUDE_DIRECTORIES