From df925395cc5ca31d2421789812a145415f6dd453 Mon Sep 17 00:00:00 2001 From: "U-ole-PC\\ole" Date: Wed, 25 May 2016 10:29:24 +0200 Subject: [PATCH] Fixes undefined reference error on MSYS2 and Ubuntu --- src/CMakeLists.txt | 7 ++++--- tests/CMakeLists.txt | 17 ++++++++++------- tests/clang_project/CMakeLists.txt | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 50994b8..8e8e0b1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -21,6 +21,7 @@ set(global_includes ${ASPELL_INCLUDE_DIR} ../libclangmm/src ../tiny-process-library + . ) set(global_libraries @@ -87,13 +88,13 @@ endif() include_directories(${global_includes}) -add_library(project_shared ${project_shared_files}) +add_library(project_shared OBJECT ${project_shared_files}) if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") AND (NOT $ENV{distribution} STREQUAL "")) add_library(${project_name} OBJECT ${project_files}) else() - add_executable(${project_name} ${project_files}) - target_link_libraries(${project_name} ${global_libraries} project_shared) + add_executable(${project_name} ${project_files} $) + target_link_libraries(${project_name} ${global_libraries}) install(TARGETS ${project_name} RUNTIME DESTINATION bin ) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e04a37a..7443baf 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -29,18 +29,21 @@ set(stub_files stubs/tooltips.cc ) -add_library(stubs ${stub_files}) +add_library(stubs OBJECT ${stub_files}) include_directories(${global_includes}) -add_executable(cmake_build_test cmake_build_test.cc) -target_link_libraries(cmake_build_test ${global_libraries} project_shared stubs) +add_executable(cmake_build_test cmake_build_test.cc + $ $) +target_link_libraries(cmake_build_test ${global_libraries}) add_test(cmake_build_test cmake_build_test) -add_executable(source_test source_test.cc) -target_link_libraries(source_test ${global_libraries} project_shared stubs) +add_executable(source_test source_test.cc + $ $) +target_link_libraries(source_test ${global_libraries}) add_test(source_test source_test) -add_executable(source_clang_test source_clang_test.cc) -target_link_libraries(source_clang_test ${global_libraries} project_shared stubs) +add_executable(source_clang_test source_clang_test.cc + $ $) +target_link_libraries(source_clang_test ${global_libraries}) add_test(source_clang_test source_clang_test) diff --git a/tests/clang_project/CMakeLists.txt b/tests/clang_project/CMakeLists.txt index 335f619..dade4ec 100644 --- a/tests/clang_project/CMakeLists.txt +++ b/tests/clang_project/CMakeLists.txt @@ -1 +1 @@ -set(project_name hello) +project(hello)