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

improve NANA_LINKS ?

Browse Source
This commit is contained in:
qPCR4vir 2016-06-23 14:36:24 +02:00
parent 747b301b32
commit 972ecc97ac
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CMakeLists.txt
View File

@ -26,8 +26,6 @@
project(nana) project(nana)
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
set(NANA_LINKS)
option(NANA_CMAKE_INSTALL_INCLUDES "Install nana includes when compile the library" ON) option(NANA_CMAKE_INSTALL_INCLUDES "Install nana includes when compile the library" ON)
option(NANA_CMAKE_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ "replaced boost.thread with meganz's mingw-std-threads." OFF) option(NANA_CMAKE_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ "replaced boost.thread with meganz's mingw-std-threads." OFF)
option(NANA_CMAKE_ENABLE_PNG "Enable the use of PNG" OFF) option(NANA_CMAKE_ENABLE_PNG "Enable the use of PNG" OFF)
@ -63,7 +61,7 @@ option(NANA_CMAKE_BOOST_FILESYSTEM_FORCE "Force use of Boost filesystem if avail
#option(NANA_CMAKE_BOOST_FILESYSTEM_INCLUDE_ROOT "Where to find <boost/filesystem.hpp>?" "../") #option(NANA_CMAKE_BOOST_FILESYSTEM_INCLUDE_ROOT "Where to find <boost/filesystem.hpp>?" "../")
#option(NANA_CMAKE_BOOST_FILESYSTEM_LIB "Flag for the compiler to link: " "-lboost/fs") #option(NANA_CMAKE_BOOST_FILESYSTEM_LIB "Flag for the compiler to link: " "-lboost/fs")
#include_directories("${NANA_CMAKE_BOOST_FILESYSTEM_INCLUDE_ROOT}") #include_directories("${NANA_CMAKE_BOOST_FILESYSTEM_INCLUDE_ROOT}")
#list(APPEND NANA_LINKS "${NANA_CMAKE_BOOST_FILESYSTEM_LIB}" ) #set(NANA_LINKS "${NANA_LINKS} ${NANA_CMAKE_BOOST_FILESYSTEM_LIB}")
if (NANA_CMAKE_NANA_FILESYSTEM_FORCE) if (NANA_CMAKE_NANA_FILESYSTEM_FORCE)
@ -87,7 +85,7 @@ elseif (NANA_CMAKE_FIND_BOOST_FILESYSTEM OR NANA_CMAKE_BOOST_FILESYSTEM_FORCE)
add_definitions(-DNANA_BOOST_FILESYSTEM_AVAILABLE) add_definitions(-DNANA_BOOST_FILESYSTEM_AVAILABLE)
include_directories(SYSTEM "${Boost_INCLUDE_DIR}") include_directories(SYSTEM "${Boost_INCLUDE_DIR}")
#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${Boost_LIBRARIES}") #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${Boost_LIBRARIES}")
list(APPEND NANA_LINKS "${Boost_LIBRARIES}") set(NANA_LINKS "${NANA_LINKS} ${Boost_LIBRARIES}")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Boost_LIBRARIES}") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Boost_LIBRARIES}")
endif (Boost_FOUND) endif (Boost_FOUND)
@ -133,7 +131,7 @@ endif(WIN32)
if(APPLE) if(APPLE)
add_definitions(-DAPPLE) add_definitions(-DAPPLE)
include_directories(/opt/X11/include/) include_directories(/opt/X11/include/)
list(APPEND NANA_LINKS -L/opt/X11/lib/ -liconv) set(NANA_LINKS "${NANA_LINKS} -L/opt/X11/lib/ -liconv")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -liconv") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -liconv")
#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/opt/X11/lib/ -liconv") #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/opt/X11/lib/ -liconv")
set(ENABLE_AUDIO OFF) set(ENABLE_AUDIO OFF)
@ -143,7 +141,7 @@ elseif(UNIX)
endif(APPLE) endif(APPLE)
if(UNIX) if(UNIX)
list(APPEND NANA_LINKS -lX11 ) set(NANA_LINKS "${NANA_LINKS} -lX11")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lX11") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lX11")
#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lX11") #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lX11")
find_package(Freetype) find_package(Freetype)
@ -151,7 +149,7 @@ if(UNIX)
include_directories( ${FREETYPE_INCLUDE_DIRS}) include_directories( ${FREETYPE_INCLUDE_DIRS})
#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lXft") #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lXft")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lXft") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lXft")
list(APPEND NANA_LINKS -lXft ) set(NANA_LINKS "${NANA_LINKS} -lXft")
endif(FREETYPE_FOUND) endif(FREETYPE_FOUND)
endif(UNIX) endif(UNIX)
@ -162,7 +160,7 @@ endif(UNIX)
if(NANA_CMAKE_ENABLE_PNG) if(NANA_CMAKE_ENABLE_PNG)
add_definitions(-DNANA_ENABLE_PNG) add_definitions(-DNANA_ENABLE_PNG)
#set(NANA_PNG_LIB "png") #set(NANA_PNG_LIB "png")
list(APPEND NANA_LINKS -lpng ) set(NANA_LINKS "${NANA_LINKS} -lpng")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lpng") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lpng")
#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lpng") #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lpng")
if(NANA_CMAKE_LIBPNG_FROM_OS) if(NANA_CMAKE_LIBPNG_FROM_OS)
@ -178,7 +176,7 @@ endif(NANA_CMAKE_ENABLE_PNG)
if(NANA_CMAKE_ENABLE_JPEG) if(NANA_CMAKE_ENABLE_JPEG)
add_definitions(-DNANA_ENABLE_JPEG) add_definitions(-DNANA_ENABLE_JPEG)
#set(NANA_JPEG_LIB "jpeg") #set(NANA_JPEG_LIB "jpeg")
list(APPEND NANA_LINKS -ljpeg ) set(NANA_LINKS "${NANA_LINKS} -ljpeg")
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ljpeg") # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ljpeg")
#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -ljpeg") #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -ljpeg")
if(NANA_CMAKE_LIBJPEG_FROM_OS) if(NANA_CMAKE_LIBJPEG_FROM_OS)
@ -196,7 +194,7 @@ if(NANA_CMAKE_ENABLE_AUDIO)
find_package(ASOUND) find_package(ASOUND)
if (ASOUND_FOUND) if (ASOUND_FOUND)
include_directories( ${ASOUND_INCLUDE_DIRS}) include_directories( ${ASOUND_INCLUDE_DIRS})
list(APPEND NANA_LINKS -lasound ) set(NANA_LINKS "${NANA_LINKS} -lasound")
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lasound") # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lasound")
#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasound") #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasound")
else(ASOUND_FOUND) else(ASOUND_FOUND)
@ -242,7 +240,7 @@ endforeach(subdir ${NANA_SOURCE_SUBDIRS})
include_directories(${NANA_INCLUDE_DIR}) include_directories(${NANA_INCLUDE_DIR})
add_library(${PROJECT_NAME} ${sources} ) add_library(${PROJECT_NAME} ${sources} )
target_link_libraries(${PROJECT_NAME} ${NANA_LINKS}) # ${NANA_LINKS} or ${ } target_link_libraries(${PROJECT_NAME} ${NANA_LINKS})
# Headers: use INCLUDE_DIRECTORIES # Headers: use INCLUDE_DIRECTORIES
# Libraries: use FIND_LIBRARY and link with the result of it (try to avoid LINK_DIRECTORIES) # Libraries: use FIND_LIBRARY and link with the result of it (try to avoid LINK_DIRECTORIES)
@ -354,8 +352,8 @@ if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND N
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.3) if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.3)
# IS_GNUCXX < 5.3 # IS_GNUCXX < 5.3
else(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.3) else(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.3)
set(CMAKE_EXE_LINKER_FLAGS " -lstdc++fs ${CMAKE_EXE_LINKER_FLAGS}") # IS_GNUCXX 5.3 or more set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lstdc++fs ") # IS_GNUCXX 5.3 or more
set(NANA_LINKS " -lstdc++fs ${NANA_LINKS}") set(NANA_LINKS "${NANA_LINKS} -lstdc++fs ")
endif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.3) endif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.3)
endif (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND NOT MINGW) endif (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND NOT MINGW)