From 19371d1d81c9826de3b3b60f4f24cf83c0d3a08b Mon Sep 17 00:00:00 2001 From: Yuichi Nishiwaki Date: Wed, 5 Mar 2014 16:06:35 +0900 Subject: [PATCH] some compilers don't support liking a static library into another shared library. compiling xfile into an object file instead. --- CMakeLists.txt | 5 ++--- src/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 110ebf11..796c292a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 2.8.8) PROJECT(picrin) @@ -15,12 +15,11 @@ execute_process( set(CMAKE_RUNTIME_OUTPUT_DIRECTORY bin) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY lib) -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY lib) set(CMAKE_C_FLAGS "-Wall -Wextra -std=c99") set(CMAKE_C_FLAGS_DEBUG "-g -DDEBUG=1") # external libraries -add_library(xfile STATIC extlib/xfile/xfile.c) +add_library(xfile OBJECT extlib/xfile/xfile.c) # build picrin include_directories(include extlib) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b1276754..cbecb0a8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,5 +5,5 @@ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${PROJECT_SOURCE # build! file(GLOB C_SOURCES ${PROJECT_SOURCE_DIR}/src/*.c) -add_library(picrin SHARED ${C_SOURCES} ${FLEX_scan_OUTPUTS}) -target_link_libraries(picrin m xfile) +add_library(picrin SHARED ${C_SOURCES} ${FLEX_scan_OUTPUTS} $) +target_link_libraries(picrin m)