From 018cfc0fab523300b594d3cee703fe986ce7b890 Mon Sep 17 00:00:00 2001 From: "Marcus D. Hanwell" Date: Sat, 5 Apr 2008 16:30:39 -0400 Subject: [PATCH] Added the tools back in and also reset the linker flags to allow them to link. --- kalzium/libavogadro-kalzium/src/CMakeLists.txt | 2 +- kalzium/libavogadro-kalzium/src/tools/CMakeLists.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/kalzium/libavogadro-kalzium/src/CMakeLists.txt b/kalzium/libavogadro-kalzium/src/CMakeLists.txt index d3ba44b..eff5e2e 100644 --- a/kalzium/libavogadro-kalzium/src/CMakeLists.txt +++ b/kalzium/libavogadro-kalzium/src/CMakeLists.txt @@ -32,4 +32,4 @@ TARGET_LINK_LIBRARIES(avogadro-kalzium ${OPENBABEL2_LIBRARIES} ${QT_LIBRARIES} add_subdirectory(engines) -#add_subdirectory(tools) +add_subdirectory(tools) diff --git a/kalzium/libavogadro-kalzium/src/tools/CMakeLists.txt b/kalzium/libavogadro-kalzium/src/tools/CMakeLists.txt index cf7de41..c71272e 100644 --- a/kalzium/libavogadro-kalzium/src/tools/CMakeLists.txt +++ b/kalzium/libavogadro-kalzium/src/tools/CMakeLists.txt @@ -15,6 +15,9 @@ include_directories( link_directories(${CMAKE_CURRENT_BINARY_DIR}/..) +# The -Wl,--no-undefined linker flag was breaking linking of the plugins +set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings") + ### drawtool set(drawtool_SRCS drawtool.cpp) qt4_add_resources(drawtool_RC_SRCS drawtool.qrc) -- 2.11.4.GIT