Updated cmake and build files to work with new FEBioConfig.cmake

Author: michaelrossherron

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.15)
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -21,95 +21,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 endif()
 
-# Find FEBio SDK or git repo automatically
-if(WIN32)
-	set(TEMP_PATHS ${CMAKE_SOURCE_DIR}/.. ${CMAKE_SOURCE_DIR}/../.. $ENV{HOMEPATH}/ $ENV{HOMEPATH}/source/repos $ENV{HOMEPATH}/*)
-else()
-    set(TEMP_PATHS ${CMAKE_SOURCE_DIR}/.. ${CMAKE_SOURCE_DIR}/../.. $ENV{HOME}/ $ENV{HOME}/*)
-endif()
-    
-find_path(FEBio_SDK FECore/Archive.h
-    PATHS ${TEMP_PATHS}
-    PATH_SUFFIXES FEBio
-    DOC "Path to the FEBio SDK, or git repo.")
-    
-if(NOT FEBio_SDK)
-    if(WIN32)
-        set(TEMP_PATHS $ENV{PROGRAMFILES}/* $ENV{HOMEPATH}/*)
-    elseif(APPLE)
-        set(TEMP_PATHS /Applications/* $ENV{HOME}/*)
-    else()
-        set(TEMP_PATHS $ENV{HOME}/*)
-    endif() 
-    
-    find_path(FEBio_SDK "include/FECore/Archive.h"
-        PATHS ${TEMP_PATHS}
-        PATH_SUFFIXES sdk
-        DOC "Path to the FEBio SDK, or git repo.")
-endif()
-
-if(NOT FEBio_SDK)
-    set(FEBio_SDK "" CACHE PATH "Path to the FEBio SDK, or git repo.")
-    message(FATAL_ERROR "Unable to find path to FEBio SDK or git repo automatically. Please set FEBio_SDK to the path to your FEBio SDK or git repo.")
-endif()
-
-# Only update the include and lib directories if the FEBio_SDK path has been changed. 
-if(NOT OLD_SDK)
-    set(NEWPATH TRUE)
-else()
-    #cmake_path(CONVERT ${OLD_SDK} TO_CMAKE_PATH_LIST STD_OLD_SDK)
-    #cmake_path(CONVERT ${FEBio_SDK} TO_CMAKE_PATH_LIST STD_FEBIO_SDK)
-    #string(COMPARE NOTEQUAL ${STD_FEBIO_SDK} ${STD_OLD_SDK} NEWPATH)
-    string(COMPARE NOTEQUAL ${FEBio_SDK} ${OLD_SDK} NEWPATH)
-endif()
-
-if(NEWPATH)
-    # Is this the SDK?
-    string(REGEX MATCH "sdk" IS_SDK ${FEBio_SDK})
-
-    set(LIB_SUFFIXES "")
-    if(IS_SDK)
-        set(FEBio_INC "${FEBio_SDK}/include" CACHE PATH "Path to FEBio include directory." FORCE)
-        
-        if(WIN32)
-            list(APPEND LIB_SUFFIXES "lib/Release" "lib/Debug" "lib")
-        else()
-            list(APPEND LIB_SUFFIXES "lib")
-        endif()
-    else()
-        set(FEBio_INC ${FEBio_SDK} CACHE PATH "Path to FEBio include directory." FORCE)
-        
-        if(WIN32)
-            list(APPEND LIB_SUFFIXES "cmbuild22/lib/Release" "cmbuild/lib/Release" "cmbuild/lib/Debug" "cbuild/lib/Release" "cbuild/lib/Debug" "build/lib/Release" "build/lib/Debug")
-        else()
-            list(APPEND LIB_SUFFIXES "cbuild/lib" "cmbuild/lib" "build/lib" "cbuild/Release/lib" "cmbuild/Release/lib" "build/Release/lib" "cbuild/Debug/lib" "cmbuild/Debug/lib" "build/Debug/lib")
-        endif()
-    endif()
-
-    mark_as_advanced(FEBio_INC)
-
-    # Find lib path
-    find_library(FECORE  
-        NAMES FECore fecore fecore_gcc64 fecore_lnx64
-        PATHS ${FEBio_SDK}
-        PATH_SUFFIXES ${LIB_SUFFIXES}
-        DOC "FEBio library path")
-
-    if(FECORE)
-        get_filename_component(FECORE_TEMP ${FECORE} DIRECTORY)
-        set(FEBio_LIB_DIR ${FECORE_TEMP} CACHE PATH "Path to the FEBio lib directory." FORCE)
-        mark_as_advanced(FEBio_LIB_DIR)
-        unset(FECORE_TEMP)
-        unset(FECORE CACHE)
-    else()
-        set(FEBio_LIB_DIR CACHE PATH "Path to the FEBio lib directory." FORCE)
-        message(SEND_ERROR "Unable to find FEBio Library path automatically. Set FEBio_LIB_DIR.")
-        unset(FECORE CACHE)
-    endif()
-endif()
-
-set(OLD_SDK ${FEBio_SDK} CACHE PATH "Don't edit. Old SDK path used to automatically make changes." FORCE)
-mark_as_advanced(OLD_SDK)
+find_package(FEBio REQUIRED)
 
 #### Check if paths are valid and find libs ####
 function(findLib libName libDir libOut)
@@ -135,11 +47,6 @@ function(findLib libName libDir libOut)
     endif()
 endfunction()
 
-if(FEBio_LIB_DIR)
-    findLib(FECore FEBio_LIB_DIR FECORE)
-    findLib(FEBioMech FEBio_LIB_DIR FEBIOMECH)
-endif()
-
 ##### Set appropriate defines and includes #####
 
 if(WIN32)
@@ -156,13 +63,6 @@ else()
     set(CMAKE_BUILD_RPATH $ORIGIN/../lib/)
 endif()
 
-# Extra compiler flags for intel compiler
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
-	set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} -static-intel)
-endif()
-
-include_directories(${FEBio_INC})
-
 ##### Add library #####
 
 file(GLOB HDR_FEBioChem "FEBioChem/*.h")
@@ -173,4 +73,4 @@ set_property(TARGET FEBioChem PROPERTY AUTOGEN_BUILD_DIR ${CMAKE_BINARY_DIR}/CMa
 
 ##### Link Libraries #####
 
-target_link_libraries(FEBioChem ${FECORE})
+target_link_libraries(FEBioChem FEBio::FECore)

ci/Linux/cmake.sh

@@ -5,5 +5,5 @@ FEBIO_SDK="$(realpath $FEBIO_SDK)"
 
 run_cmake() {
 	cmake -L . -B cmbuild \
-		-DFEBio_SDK=$FEBIO_SDK
+		-DCMAKE_PREFIX_PATH=$FEBIO_SDK
 }

ci/Windows/build.bat

@@ -10,7 +10,7 @@ cd %SCRIPTDIR%\..\..\
 if not defined FEBIO_SDK set "FEBIO_SDK=%STARTDIR%\febio4-sdk"
 
 cmake -L . -B cmbuild ^
-  -DFEBio_SDK=%FEBIO_SDK%
+  -DCMAKE_PREFIX_PATH=%FEBIO_SDK%
 
 cd cmbuild
 msbuild /P:Configuration=Release /P:WarningLevel=0 /m:%PROC% ALL_BUILD.vcxproj

ci/macOS/cmake.sh

@@ -2,6 +2,6 @@ FEBIO_SDK="${FEBIO_SDK:-febio4-sdk}"
 FEBIO_SDK="$(realpath $FEBIO_SDK)"
 run_cmake() {
 	cmake -L . -B cmbuild \
-		-DFEBio_SDK=$FEBIO_SDK \
+		-DCMAKE_PREFIX_PATH=$FEBIO_SDK \
 		-DCMAKE_OSX_ARCHITECTURES=x86_64
 }