Merge pull request #1710 from chriseth/linkage

Use BUILD_SHARED_LIBS

cmake/EthCompilerSettings.cmake

@@ -8,7 +8,6 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
 	set(CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG -DETH_RELEASE")
 	set(CMAKE_CXX_FLAGS_RELEASE        "-O3 -DNDEBUG -DETH_RELEASE")
 	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DETH_RELEASE")
-	set(ETH_SHARED 1)
 
 	if (PROFILING)
 		set(CMAKE_CXX_FLAGS "-g ${CMAKE_CXX_FLAGS}")
@@ -31,7 +30,6 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
 	set(CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG -DETH_RELEASE")
 	set(CMAKE_CXX_FLAGS_RELEASE        "-O3 -DNDEBUG -DETH_RELEASE")
 	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DETH_DEBUG")
-	set(ETH_SHARED 1)
 
 	if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++ -fcolor-diagnostics -Qunused-arguments -DBOOST_ASIO_HAS_CLANG_LIBCXX")
@@ -55,8 +53,10 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 	# stack size 16MB
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4099,4075 /STACK:16777216")
 	# windows likes static
-	set(ETH_STATIC 1)
+	if (NOT ETH_STATIC)
-
+		message("Forcing static linkage for MSVC.")
+		set(ETH_STATIC 1)
+	endif ()
 else ()
 	message(WARNING "Your compiler is not tested, if you run into any issues, we'd welcome any patches.")
 endif ()
@@ -72,3 +72,8 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA
 	endif ()
 endif ()
 
+if(ETH_STATIC)
+	set(BUILD_SHARED_LIBS OFF)
+else()
+	set(BUILD_SHARED_LIBS ON)
+endif(ETH_STATIC)

evmjit/libevmjit-cpp/CMakeLists.txt

@@ -15,7 +15,7 @@ else()
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") # add PIC for archive
 endif()
 
-add_library(${TARGET_NAME} ${SOURCES})
+add_library(${TARGET_NAME} STATIC ${SOURCES})
 set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER "libs")
 
 include_directories(../..)

libdevcore/CMakeLists.txt

@@ -20,11 +20,7 @@ set(EXECUTABLE devcore)
 
 file(GLOB HEADERS "*.h")
 
-if(ETH_STATIC)
+add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
-else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
-endif()
 
 target_link_libraries(${EXECUTABLE} ${Boost_THREAD_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${Boost_SYSTEM_LIBRARIES})

libdevcrypto/CMakeLists.txt

@@ -17,11 +17,7 @@ include_directories(${LEVELDB_INCLUDE_DIRS})
 set(EXECUTABLE devcrypto)
 
 file(GLOB HEADERS "*.h")
-if(ETH_STATIC)
+add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
-else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
-endif()
 
 target_link_libraries(${EXECUTABLE} ${Boost_FILESYSTEM_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES})

libethcore/CMakeLists.txt

@@ -24,11 +24,7 @@ set(EXECUTABLE ethcore)
 
 file(GLOB HEADERS "*.h")
 
-if(ETH_STATIC)
+add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
-else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
-endif()
 
 target_link_libraries(${EXECUTABLE} ethash)
 target_link_libraries(${EXECUTABLE} devcrypto)

libethereum/CMakeLists.txt

@@ -19,11 +19,7 @@ set(EXECUTABLE ethereum)
 
 file(GLOB HEADERS "*.h")
 
-if (ETH_STATIC)
+add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
-else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
-endif()
 
 target_link_libraries(${EXECUTABLE} evm)
 target_link_libraries(${EXECUTABLE} lll)

libethereumx/CMakeLists.txt

@@ -11,11 +11,7 @@ set(EXECUTABLE ethereumx)
 
 file(GLOB HEADERS "*.h") 
 
-if (ETH_STATIC)
+add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
-else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
-endif()
 
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
 target_link_libraries(${EXECUTABLE} ${CRYPTOPP_LS})

libevm/CMakeLists.txt

@@ -20,11 +20,7 @@ set(EXECUTABLE evm)
 
 file(GLOB HEADERS "*.h")
 
-if (ETH_STATIC)
+add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
-else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
-endif()
 
 target_link_libraries(${EXECUTABLE} ethcore)
 target_link_libraries(${EXECUTABLE} devcrypto)

libevmcore/CMakeLists.txt

@@ -19,11 +19,7 @@ set(EXECUTABLE evmcore)
 
 file(GLOB HEADERS "*.h")
 
-if (ETH_STATIC)
+add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
-else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
-endif()
 
 target_link_libraries(${EXECUTABLE} devcore)
 target_link_libraries(${EXECUTABLE} devcrypto)

liblll/CMakeLists.txt

@@ -19,11 +19,7 @@ set(EXECUTABLE lll)
 
 file(GLOB HEADERS "*.h")
 
-if(ETH_STATIC)
+add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
-else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
-endif()
 
 target_link_libraries(${EXECUTABLE} evmcore)
 target_link_libraries(${EXECUTABLE} devcore)

libnatspec/CMakeLists.txt

@@ -22,11 +22,7 @@ file(GLOB HEADERS "*.h")
 
 qt5_add_resources(NATSPECQRC natspec.qrc)
 
-if (ETH_STATIC)
+add_library(${EXECUTABLE} ${RESOURCE_ADDED} ${SRC_LIST} ${HEADERS} ${NATSPECQRC})
-	add_library(${EXECUTABLE} STATIC ${RESOURCE_ADDED} ${SRC_LIST} ${HEADERS} ${NATSPECQRC})
-else()
-	add_library(${EXECUTABLE} SHARED ${RESOURCE_ADDED} ${SRC_LIST} ${HEADERS} ${NATSPECQRC})
-endif()
 
 target_link_libraries(${EXECUTABLE} Qt5::Core)
 target_link_libraries(${EXECUTABLE} Qt5::Qml)

libp2p/CMakeLists.txt

@@ -25,11 +25,7 @@ set(EXECUTABLE p2p)
 
 file(GLOB HEADERS "*.h")
 
-if(ETH_STATIC)
+add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
-else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
-endif()
 
 if (MINIUPNPC_FOUND)
 	target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LIBRARIES})

libserpent/CMakeLists.txt

@@ -17,11 +17,7 @@ set(EXECUTABLE serpent)
 
 file(GLOB HEADERS "*.h")
 
-if(ETH_STATIC)
+add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
-else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
-endif()
 
 target_link_libraries(${EXECUTABLE} lll)
 target_link_libraries(${EXECUTABLE} evmcore)

libsolidity/CMakeLists.txt

@@ -19,11 +19,7 @@ set(EXECUTABLE solidity)
 
 file(GLOB HEADERS "*.h") 
 
-if (ETH_STATIC)
+add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
-else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
-endif()
 
 target_link_libraries(${EXECUTABLE} ${JSONCPP_LIBRARIES})
 target_link_libraries(${EXECUTABLE} evmcore)

libtestutils/CMakeLists.txt

@@ -23,11 +23,7 @@ if (NOT JSONRPC)
 	list(REMOVE_ITEM HEADERS "./FixedWebThreeServer.h")
 endif()
 
-if (ETH_STATIC)
+add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
-else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
-endif()
 
 target_link_libraries(${EXECUTABLE} ${Boost_FILESYSTEM_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${JSONCPP_LIBRARIES})

libweb3jsonrpc/CMakeLists.txt

@@ -20,11 +20,7 @@ set(EXECUTABLE web3jsonrpc)
 
 file(GLOB HEADERS "*.h")
 
-if (ETH_STATIC)
+add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
-else ()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
-endif ()
 
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${JSONCPP_LIBRARIES})

libwebthree/CMakeLists.txt

@@ -19,11 +19,7 @@ set(EXECUTABLE webthree)
 
 file(GLOB HEADERS "*.h")
 
-if (ETH_STATIC)
+add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
-else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
-endif()
 
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES})
 

libwhisper/CMakeLists.txt

@@ -19,11 +19,7 @@ set(EXECUTABLE whisper)
 
 file(GLOB HEADERS "*.h")
 
-if (ETH_STATIC)
+add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
-else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
-endif()
 
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES})
 

secp256k1/CMakeLists.txt

@@ -14,22 +14,14 @@ file(GLOB HEADERS "*.h")
 
 if (APPLE OR UNIX)
 
-	if (ETH_STATIC)
+	add_library(${EXECUTABLE} ${EXECUTABLE}.c field_5x52_asm.asm)
-		add_library(${EXECUTABLE} STATIC ${EXECUTABLE}.c field_5x52_asm.asm)
-	else()
-		add_library(${EXECUTABLE} SHARED ${EXECUTABLE}.c field_5x52_asm.asm)
-	endif()
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -DUSE_FIELD_GMP -DUSE_NUM_GMP -DUSE_FIELD_INV_NUM")
 	target_link_libraries(${EXECUTABLE} ${GMP_LIBRARIES})
 elseif (CMAKE_COMPILER_IS_MINGW)
 
 	include_directories(${Boost_INCLUDE_DIRS})
 
-	if (ETH_STATIC)
+	add_library(${EXECUTABLE} ${EXECUTABLE}.c field_5x52_asm.asm)
-		add_library(${EXECUTABLE} STATIC ${EXECUTABLE}.c field_5x52_asm.asm)
-	else()
-		add_library(${EXECUTABLE} SHARED ${EXECUTABLE}.c field_5x52_asm.asm)
-	endif()
 
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -W -Wall -Wextra -Wcast-align -Wnested-externs -Wshadow -Wstrict-prototypes -Wno-unused-function -DUSE_FIELD_GMP -DUSE_NUM_GMP -DUSE_FIELD_INV_NUM")
 	target_link_libraries(${EXECUTABLE} ${GMP_LIBRARIES})
@@ -37,11 +29,7 @@ else()
 
 	include_directories(${Boost_INCLUDE_DIRS})
 
-	if (ETH_STATIC)
+	add_library(${EXECUTABLE} ${EXECUTABLE}.c)
-		add_library(${EXECUTABLE} STATIC ${EXECUTABLE}.c)
-	else()
-		add_library(${EXECUTABLE} SHARED ${EXECUTABLE}.c)
-	endif()
 	# /TP - compile project as cpp project
 	set_target_properties(${EXECUTABLE} PROPERTIES COMPILE_FLAGS "/TP /wd4244")
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_NUM_BOOST -DUSE_FIELD_10X26 -DUSE_FIELD_INV_BUILTIN")

solc/CMakeLists.txt

@@ -19,9 +19,5 @@ target_link_libraries(${EXECUTABLE} solidity)
 
 install( TARGETS ${EXECUTABLE} DESTINATION bin )
 
-if (ETH_STATIC)
+add_library(soljson jsonCompiler.cpp ${HEADERS})
-	add_library(soljson STATIC jsonCompiler.cpp ${HEADERS})
-else()
-	add_library(soljson SHARED jsonCompiler.cpp ${HEADERS})
-endif()
 target_link_libraries(soljson solidity)