FIX linking with CMake - CLion - gcc 5.1
This commit is contained in:
parent
067eeff3dd
commit
477ea05ced
@ -37,7 +37,7 @@ option(NANA_CMAKE_LIBJPEG_FROM_OS "Use libjpeg from operating system." ON)
|
||||
option(NANA_CMAKE_ENABLE_AUDIO "Enable class audio::play for PCM playback." OFF)
|
||||
option(NANA_CMAKE_VERBOSE_PREPROCESSOR "Show annoying debug messages during compilation." ON)
|
||||
option(NANA_CMAKE_STOP_VERBOSE_PREPROCESSOR "Stop compilation after showing the annoying debug messages." ON)
|
||||
option(NANA_CMAKE_BUILD_DEMOS "Build all the demos form the nana_demo repository." OFF)
|
||||
option(NANA_CMAKE_BUILD_DEMOS "Build all the demos form the nana_demo repository." ON)
|
||||
option(NANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS "" ON)
|
||||
option(NANA_CMAKE_AUTOMATIC_GUI_TESTING "Activate automatic GUI testing?" OFF)
|
||||
option(NANA_CMAKE_BUILD_FreeMe "Build FreeMe (currently broken)?" OFF)
|
||||
@ -87,6 +87,7 @@ elseif (NANA_CMAKE_FIND_BOOST_FILESYSTEM OR NANA_CMAKE_BOOST_FILESYSTEM_FORCE)
|
||||
add_definitions(-DNANA_BOOST_FILESYSTEM_AVAILABLE)
|
||||
include_directories(SYSTEM "${Boost_INCLUDE_DIR}")
|
||||
list(APPEND NANA_LINKS "${Boost_LIBRARIES}")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Boost_LIBRARIES}")
|
||||
endif (Boost_FOUND)
|
||||
|
||||
set(Boost_USE_STATIC_LIBS ON)
|
||||
@ -110,7 +111,7 @@ add_definitions(-DNANA_IGNORE_CONF)
|
||||
|
||||
if(WIN32)
|
||||
add_definitions(-DWIN32)
|
||||
set(BUILD_FreeMe ON) #"Build FreeMe only on Windows."
|
||||
# set(BUILD_FreeMe ON) #"Build FreeMe only on Windows."
|
||||
#Global MSVC definitions. You may prefer the hand-tuned sln and projects from the nana repository.
|
||||
if(MSVC)
|
||||
option(WIN32_USE_MP "Set to ON to build nana with the /MP option (Visual Studio 2005 and above)." ON)
|
||||
@ -132,6 +133,7 @@ if(APPLE)
|
||||
add_definitions(-DAPPLE)
|
||||
include_directories(/opt/X11/include/)
|
||||
list(APPEND NANA_LINKS -L/opt/X11/lib/ -liconv)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -liconv")
|
||||
set(ENABLE_AUDIO OFF)
|
||||
elseif(UNIX)
|
||||
add_definitions(-Dlinux)
|
||||
@ -140,10 +142,12 @@ endif(APPLE)
|
||||
|
||||
if(UNIX)
|
||||
list(APPEND NANA_LINKS -lX11 )
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lX11")
|
||||
find_package(Freetype)
|
||||
if (FREETYPE_FOUND)
|
||||
include_directories( ${FREETYPE_INCLUDE_DIRS})
|
||||
list(APPEND NANA_LINKS -lXft )
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lXft")
|
||||
list(APPEND NANA_LINKS -lXft )
|
||||
endif(FREETYPE_FOUND)
|
||||
endif(UNIX)
|
||||
|
||||
@ -154,7 +158,8 @@ 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")
|
||||
if(NANA_CMAKE_LIBPNG_FROM_OS)
|
||||
find_package(PNG)
|
||||
if (PNG_FOUND)
|
||||
@ -168,7 +173,8 @@ 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")
|
||||
if(NANA_CMAKE_LIBJPEG_FROM_OS)
|
||||
find_package(JPEG)
|
||||
if (JPEG_FOUND)
|
||||
@ -184,7 +190,8 @@ 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")
|
||||
else(ASOUND_FOUND)
|
||||
message(FATAL_ERROR "libasound is not found")
|
||||
endif(ASOUND_FOUND)
|
||||
@ -228,7 +235,7 @@ endforeach(subdir ${NANA_SOURCE_SUBDIRS})
|
||||
|
||||
include_directories(${NANA_INCLUDE_DIR})
|
||||
add_library(${PROJECT_NAME} ${sources} )
|
||||
target_link_libraries(${PROJECT_NAME} ${NANA_LINKS})
|
||||
target_link_libraries(${PROJECT_NAME} ) # ${NANA_LINKS} or ${CMAKE_CXX_FLAGS}
|
||||
|
||||
# Headers: use INCLUDE_DIRECTORIES
|
||||
# Libraries: use FIND_LIBRARY and link with the result of it (try to avoid LINK_DIRECTORIES)
|
||||
@ -260,7 +267,7 @@ if (NANA_CMAKE_BUILD_DEMOS)
|
||||
foreach ( demo ${demos})
|
||||
add_executable(${demo} "../nana-demo/${demo}.cpp")
|
||||
set_property( TARGET ${demo} PROPERTY CXX_STANDARD 14 )
|
||||
target_link_libraries(${demo} ${PROJECT_NAME})
|
||||
target_link_libraries(${demo} ${PROJECT_NAME}) # ${NANA_LINKS} or ${CMAKE_CXX_FLAGS}
|
||||
#if(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
|
||||
#add_custom_command( TARGET ${demo} POST_BUILD COMMAND ${demo} )
|
||||
#add_custom_target(do_always_${demo} ALL COMMAND ${demo})
|
||||
@ -272,19 +279,19 @@ if (NANA_CMAKE_BUILD_DEMOS)
|
||||
|
||||
set (demos widget_show widget_show2 )
|
||||
|
||||
if (NANA_CMAKE_BUILD_FreeMe)
|
||||
add_definitions(-DBUILD_FreeMe)
|
||||
endif (NANA_CMAKE_BUILD_FreeMe)
|
||||
#if (NANA_CMAKE_BUILD_FreeMe)
|
||||
# add_definitions(-DBUILD_FreeMe)
|
||||
#endif (NANA_CMAKE_BUILD_FreeMe)
|
||||
|
||||
if (NANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS)
|
||||
list(APPEND demos FreeMe) # ??
|
||||
endif (NANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS)
|
||||
# if (NANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS)
|
||||
# list(APPEND demos ) # ?? FreeMe
|
||||
# endif (NANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS)
|
||||
# Pending: FreeMe (added but really completelly compiled if defined BUILD_FreeMe )
|
||||
|
||||
foreach ( demo ${demos})
|
||||
add_executable(${demo} "../nana-demo/${demo}.cpp")
|
||||
set_property( TARGET ${demo} PROPERTY CXX_STANDARD 14 )
|
||||
target_link_libraries(${demo} ${PROJECT_NAME})
|
||||
target_link_libraries(${demo} ${PROJECT_NAME}) # ${NANA_LINKS} or ${CMAKE_CXX_FLAGS}
|
||||
install(TARGETS ${demo} RUNTIME DESTINATION "../nana-demo/")
|
||||
message("... to build: ../nana-demo/${demo}.cpp" )
|
||||
endforeach( demo ${demos})
|
||||
@ -302,7 +309,7 @@ endif (NANA_CMAKE_BUILD_FreeMe)
|
||||
foreach ( demo ${demos})
|
||||
add_executable(${demo} "../nana-demo/Examples/${demo}.cpp")
|
||||
set_property( TARGET ${demo} PROPERTY CXX_STANDARD 14 )
|
||||
target_link_libraries(${demo} ${PROJECT_NAME})
|
||||
target_link_libraries(${demo} ${PROJECT_NAME}) # ${NANA_LINKS} or ${CMAKE_CXX_FLAGS}
|
||||
install(TARGETS ${demo} RUNTIME DESTINATION "../nana-demo/Examples/")
|
||||
message("... to build: ../nana-demo/Examples/${demo}.cpp" )
|
||||
endforeach( demo ${demos})
|
||||
@ -322,18 +329,21 @@ endif (NANA_CMAKE_BUILD_DEMOS)
|
||||
# set compile flags
|
||||
if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
|
||||
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14 -Wall")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14 -Wall") # Clang
|
||||
else("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -lstdc++fs -Wall")
|
||||
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.3)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall") # IS_GNUCXX < 5.3
|
||||
else()
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -lstdc++fs -Wall") # IS_GNUCXX 5.3 or more
|
||||
endif()
|
||||
endif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
|
||||
|
||||
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)
|
||||
#set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -pthread")
|
||||
|
||||
#set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -pthread")
|
||||
endif ()
|
||||
|
||||
if (APPLE AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user