Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=95864551981a8d27562cc22c6c28e3bde9a4850e
commit 95864551981a8d27562cc22c6c28e3bde9a4850e Author: Michel Hermier <[email protected]> Date: Sat Dec 7 14:09:28 2013 +0100 cmake: Make static building make correctly, all static executables have the .static suffix. diff --git a/CMakeLists.txt b/CMakeLists.txt index 01bd331..23a10dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,19 +23,23 @@ option(ENABLE_STATIC "make a static build" OFF) option(FAKEROOT_PROOF "enable fakeroot proof protection" OFF) if(ENABLE_STATIC) - set(CMAKE_PROJECT_NAME_LOWER ${CMAKE_PROJECT_NAME_LOWER}.static) +# set(CMAKE_PROJECT_NAME_LOWER ${CMAKE_PROJECT_NAME_LOWER}.static) + set(CMAKE_EXECUTABLE_SUFFIX ".static") set(BUILD_TYPE STATIC) set(BUILD_SHARED_LIBS OFF) # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static") # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static") -# set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static") # set(CMAKE_EXE_LINKER_FLAGS "-static -static-libgcc -pthread") set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX}) # set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_FIND_LIBRARY_SUFFIXES}) -# set(CMAKE_EXE_LINK_DYNAMIC_C_FLAGS) # remove -Wl,-Bdynamic) -# set(CMAKE_SHARED_LIBRARY_C_FLAGS) # remove -fPIC -# set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS) # remove -rdynamic + set(CMAKE_EXE_LINK_DYNAMIC_C_FLAGS) # remove -Wl,-Bdynamic + set(CMAKE_EXE_LINK_DYNAMIC_CXX_FLAGS) + set(CMAKE_SHARED_LIBRARY_C_FLAGS) # remove -fPIC + set(CMAKE_SHARED_LIBRARY_CXX_FLAGS) + set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS) # remove -rdynamic + set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS) else() set(BUILD_TYPE SHARED) endif(ENABLE_STATIC) @@ -148,4 +152,3 @@ ADD_SUBDIRECTORY(src/versort) ADD_SUBDIRECTORY(src/vercmp) ADD_SUBDIRECTORY(scripts) ADD_SUBDIRECTORY(pactest) - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
