Fix static and clang builds

Cmake ordering was leading to ignored flags.
This commit is contained in:
Kevin Boyd
2020-06-22 11:11:40 -07:00
parent e71781fd7a
commit 46e5bac34c
3 changed files with 18 additions and 12 deletions

3
.gitmodules vendored
View File

@@ -1,3 +1,6 @@
[submodule "third_party/farmhash"]
path = third_party/farmhash
url = https://github.com/google/farmhash
[submodule "farmhash"]
path = farmhash
url = https://github.com/google/farmhash

View File

@@ -13,7 +13,6 @@
# limitations under the License.
cmake_minimum_required (VERSION 3.2)
project (cpu_check VERSION 20181130 LANGUAGES C CXX)
# Options
# Use clang/llvm by default.
@@ -25,6 +24,20 @@ if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release)
endif(NOT CMAKE_BUILD_TYPE)
if (USE_CLANG)
set(CMAKE_C_COMPILER clang)
set(CMAKE_CXX_COMPILER clang++)
set(CC clang)
set(CXX clang++)
endif(USE_CLANG)
if (BUILD_STATIC)
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
set(CMAKE_EXE_LINKER_FLAGS "-static-libstdc++ -static-libgcc")
endif(BUILD_STATIC)
project (cpu_check VERSION 20181130 LANGUAGES C CXX)
# Begin Google local change
@@ -56,13 +69,6 @@ configure_file (
)
include_directories("${PROJECT_BINARY_DIR}")
if (USE_CLANG)
set(CMAKE_C_COMPILER clang)
set(CMAKE_CXX_COMPILER clang++)
set(CC clang)
set(CXX clang++)
endif(USE_CLANG)
set(CMAKE_C_FLAGS_DEBUG "-g -Wall -O0")
set(CMAKE_CXX_FLAGS_DEBUG "-g -Wall -O0")
set(CMAKE_C_FLAGS_RELEASE "-Wall -O2")
@@ -110,10 +116,6 @@ target_link_libraries(cpu_check fvt_controller ${VENDORS_LIBS} utils)
# End Google local change
target_link_libraries(crc32c_test crc32c)
if (BUILD_STATIC)
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
endif(BUILD_STATIC)
# Needs pthreads
find_package(Threads REQUIRED)
target_link_libraries(cpu_check Threads::Threads)

1
farmhash Submodule

Submodule farmhash added at 0d859a8118