Merge pull request #177 from bitshares/cmake_simplification

Get rid of most extra cmake modules
bitshares · Nov 6, 2019 · 41aaa6c · 41aaa6c
2 parents e48941b + 7e07bc4
commit 41aaa6c
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 966 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,8 +21,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/GitVersionGen")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
 
 INCLUDE(GetPrerequisites)
-INCLUDE( VersionMacros )
-INCLUDE( SetupTargetMacros )
 INCLUDE(GetGitRevisionDescription)
 INCLUDE(CheckLibraryExists)
 
@@ -159,8 +157,6 @@ ENDIF( LIBCXX_HAVE_CXX_ATOMICS_WITH_LIB )
 
 find_package(OpenSSL REQUIRED)
 
-option( UNITY_BUILD OFF )
-
 set( fc_sources
      src/popcount.cpp
      src/variant.cpp
@@ -243,7 +239,7 @@ list(APPEND sources ${fc_headers})
 
 add_subdirectory( vendor/websocketpp EXCLUDE_FROM_ALL )
 
-setup_library( fc SOURCES ${sources} LIBRARY_TYPE STATIC )
+add_library( fc ${sources} )
 install( DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" DESTINATION include )
 
 # begin editline stuff

diff --git a/CMakeModules/ArgumentParser.cmake b/CMakeModules/ArgumentParser.cmake
diff --git a/CMakeModules/FindVLD.cmake b/CMakeModules/FindVLD.cmake
diff --git a/CMakeModules/ParseLibraryList.cmake b/CMakeModules/ParseLibraryList.cmake