diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e2d90d4..c0b48a52 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -148,7 +148,6 @@ endif(WIN32) if(APPLE) add_definitions(-DAPPLE) include_directories(/opt/X11/include/) - list(APPEND NANA_LINKS -L/opt/X11/lib/ -liconv) target_link_libraries(${PROJECT_NAME} PRIVATE iconv) set(ENABLE_AUDIO OFF) elseif(UNIX) @@ -158,7 +157,6 @@ endif(APPLE) if(UNIX) find_package(X11 REQUIRED) - list(APPEND NANA_LINKS ${X11_LIBRARIES}) target_link_libraries(${PROJECT_NAME} PRIVATE ${X11_LIBRARIES} PRIVATE ${X11_Xft_LIB} @@ -174,7 +172,6 @@ if(UNIX) PRIVATE ${FREETYPE_INCLUDE_DIRS} PRIVATE ${FONTCONFIG_INCLUDE_DIR} ) - list(APPEND NANA_LINKS ${FREETYPE_LIBRARIES}) target_link_libraries(${PROJECT_NAME} PRIVATE ${FREETYPE_LIBRARIES} PRIVATE ${FONTCONFIG_LIBRARIES} @@ -208,10 +205,8 @@ if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") # AN target_link_libraries(${PROJECT_NAME} PRIVATE Threads::Threads) if(NANA_CMAKE_SHARED_LIB) - list(APPEND NANA_LINKS -lgcc -lstdc++) else() set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++") - # message("Setting NANA_LINKS to -static-libgcc -static-libstdc++ -pthread or ${NANA_LINKS}") endif(NANA_CMAKE_SHARED_LIB) if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.3) @@ -237,7 +232,6 @@ if(NANA_CMAKE_ENABLE_PNG) if(NANA_CMAKE_LIBPNG_FROM_OS) find_package(PNG) if (PNG_FOUND) - list(APPEND NANA_LINKS ${PNG_LIBRARIES}) target_include_directories(${PROJECT_NAME} PRIVATE PNG::PNG) target_compile_definitions(${PROJECT_NAME} PUBLIC USE_LIBPNG_FROM_OS) endif(PNG_FOUND) @@ -253,7 +247,6 @@ if(NANA_CMAKE_ENABLE_JPEG) find_package(JPEG) if (JPEG_FOUND) target_include_directories(${PROJECT_NAME PRIVATE ${JPEG_INCLUDE_DIR}) - list(APPEND NANA_LINKS ${JPEG_LIBRARIES}) target_link_libraries(${PROJECT_NAME} PRIVATE ${JPEG_LIBRARIES}) target_compile_definitions(${PROJECT_NAME} PUBLIC USE_LIBJPEG_FROM_OS) endif(JPEG_FOUND) @@ -269,7 +262,6 @@ if(NANA_CMAKE_ENABLE_AUDIO) find_package(ASOUND) if (ASOUND_FOUND) target_include_directories(${PROJECT_NAME PRIVATE ${ASOUND_INCLUDE_DIRS}) - list(APPEND NANA_LINKS -lasound) target_link_libraries(${PROJECT_NAME} PRIVATE ${ASOUND_LIBRARIES}) else(ASOUND_FOUND) message(FATAL_ERROR "libasound is not found") @@ -293,7 +285,6 @@ elseif (NANA_CMAKE_FIND_BOOST_FILESYSTEM OR NANA_CMAKE_BOOST_FILESYSTEM_FORCE) find_package(Boost COMPONENTS filesystem) if (Boost_FOUND) add_definitions(-DNANA_BOOST_FILESYSTEM_AVAILABLE) - list(APPEND NANA_LINKS ${Boost_LIBRARIES}) ###### FIRST !!!!!!!!!!!!!!!!! add is not first target_link_libraries(${PROJECT_NAME} PUBLIC Boost::Boost) endif (Boost_FOUND) set(Boost_USE_STATIC_LIBS ON) @@ -394,7 +385,6 @@ message ( "CMAKE_COMPILER_IS_GNUCXX = " ${CMAKE_COMPILER_IS_GNUCXX}) message ( "CMAKE_CXX_FLAGS = " ${CMAKE_CXX_FLAGS}) message ( "CMAKE_EXE_LINKER_FLAGS = " ${CMAKE_EXE_LINKER_FLAGS}) message ( "CMAKE_STATIC_LINKER_FLAGS = " ${CMAKE_STATIC_LINKER_FLAGS}) -message ( "NANA_LINKS = " ${NANA_LINKS}) message ( "DESTDIR = " ${DESTDIR}) message ( "CMAKE_INSTALL_PREFIX = " ${CMAKE_INSTALL_PREFIX}) message ( "NANA_INCLUDE_DIR = " ${NANA_INCLUDE_DIR})