From f22cb91557830a47c318b4b3d2e0de9aa16e62db Mon Sep 17 00:00:00 2001 From: Ariel Vina-Rodriguez Date: Wed, 22 Jun 2016 16:44:50 +0200 Subject: [PATCH] return to using NANA_LINKS only --- CMakeLists.txt | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a5314e18..d05ed3c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,11 +84,11 @@ elseif (NANA_CMAKE_FIND_BOOST_FILESYSTEM OR NANA_CMAKE_BOOST_FILESYSTEM_FORCE) # If using Boost::thread, then Thread::Thread will also be added automatically. find_package(Boost COMPONENTS filesystem) if (Boost_FOUND) - add_definitions(-DNANA_BOOST_FILESYSTEM_AVAILABLE) - include_directories(SYSTEM "${Boost_INCLUDE_DIR}") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${Boost_LIBRARIES}") - #list(APPEND NANA_LINKS "${Boost_LIBRARIES}") - #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Boost_LIBRARIES}") + add_definitions(-DNANA_BOOST_FILESYSTEM_AVAILABLE) + include_directories(SYSTEM "${Boost_INCLUDE_DIR}") + #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${Boost_LIBRARIES}") + list(APPEND NANA_LINKS "${Boost_LIBRARIES}") + #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Boost_LIBRARIES}") endif (Boost_FOUND) set(Boost_USE_STATIC_LIBS ON) @@ -133,9 +133,9 @@ endif(WIN32) if(APPLE) add_definitions(-DAPPLE) include_directories(/opt/X11/include/) - #list(APPEND NANA_LINKS -L/opt/X11/lib/ -liconv) + list(APPEND NANA_LINKS -L/opt/X11/lib/ -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) elseif(UNIX) add_definitions(-Dlinux) @@ -145,13 +145,13 @@ endif(APPLE) if(UNIX) list(APPEND NANA_LINKS -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) if (FREETYPE_FOUND) 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") - #list(APPEND NANA_LINKS -lXft ) + list(APPEND NANA_LINKS -lXft ) endif(FREETYPE_FOUND) endif(UNIX) @@ -162,9 +162,9 @@ endif(UNIX) if(NANA_CMAKE_ENABLE_PNG) add_definitions(-DNANA_ENABLE_PNG) #set(NANA_PNG_LIB "png") - #list(APPEND NANA_LINKS -lpng ) + list(APPEND NANA_LINKS -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) find_package(PNG) if (PNG_FOUND) @@ -178,9 +178,9 @@ endif(NANA_CMAKE_ENABLE_PNG) if(NANA_CMAKE_ENABLE_JPEG) add_definitions(-DNANA_ENABLE_JPEG) #set(NANA_JPEG_LIB "jpeg") - # list(APPEND NANA_LINKS -ljpeg ) + list(APPEND NANA_LINKS -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) find_package(JPEG) if (JPEG_FOUND) @@ -196,9 +196,9 @@ if(NANA_CMAKE_ENABLE_AUDIO) find_package(ASOUND) if (ASOUND_FOUND) include_directories( ${ASOUND_INCLUDE_DIRS}) - # list(APPEND NANA_LINKS -lasound ) + list(APPEND NANA_LINKS -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) message(FATAL_ERROR "libasound is not found") endif(ASOUND_FOUND) @@ -232,8 +232,8 @@ if(NANA_CMAKE_ENABLE_AUDIO) endif() # collect all source files in the source-sub-dir -#To show .h files in Visual Studio, add them to the list of sources in add_executable / add_library -#and Use SOURCE_GROUP if all your sources are in the same directory +#To show .h files in Visual Studio, add them to the list of sources in add_executable / add_library +#and Use SOURCE_GROUP if all your sources are in the same directory foreach(subdir ${NANA_SOURCE_SUBDIRS}) aux_source_directory(${NANA_SOURCE_DIR}${subdir} sources) # message("Subir: ${subdir}") @@ -242,7 +242,7 @@ endforeach(subdir ${NANA_SOURCE_SUBDIRS}) include_directories(${NANA_INCLUDE_DIR}) add_library(${PROJECT_NAME} ${sources} ) -target_link_libraries(${PROJECT_NAME} ) # ${NANA_LINKS} or ${ } +target_link_libraries(${PROJECT_NAME} ${NANA_LINKS}) # ${NANA_LINKS} or ${ } # Headers: use INCLUDE_DIRECTORIES # Libraries: use FIND_LIBRARY and link with the result of it (try to avoid LINK_DIRECTORIES) @@ -349,14 +349,16 @@ endif(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") # enable static linkage if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND NOT MINGW) # GNU || CLang not MinGW #set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++ -pthread") + set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -pthread") if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.3) # IS_GNUCXX < 5.3 - else() - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lstdc++fs") # IS_GNUCXX 5.3 or more - endif() -endif () + 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 + endif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.3) + +endif (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND NOT MINGW) + if (APPLE AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") # APPLE Clang set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libstdc++")