diff --git a/deps/falkolib b/deps/falkolib deleted file mode 160000 index 8f341e9f1739c445cd8352586d514e2e49e25718..0000000000000000000000000000000000000000 --- a/deps/falkolib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8f341e9f1739c445cd8352586d514e2e49e25718 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fee4770bdba203fb9a05226d54c9de23e30e96ce..d7d87c33825737b1bead260c87758fb7950dea16 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,13 +12,7 @@ ENDIF(faramotics_FOUND) FIND_PACKAGE(Eigen3 3.3 REQUIRED) FIND_PACKAGE(csm QUIET) - -find_package(falkolib REQUIRED) -message(STATUS "falkolib_FOUND ${falkolib_FOUND}") -message(STATUS "falkolib_INCLUDE_DIRS ${falkolib_INCLUDE_DIRS}") -message(STATUS "falkolib_LIBRARY_DIRS ${falkolib_LIBRARY_DIRS}") -message(STATUS "falkolib_LIBRARIES ${falkolib_LIBRARIES}") - +FIND_PACKAGE(falkolib QUIET) #include directories INCLUDE_DIRECTORIES(. /usr/local/include) @@ -29,12 +23,15 @@ ENDIF(csm_FOUND) IF(faramotics_FOUND) INCLUDE_DIRECTORIES(${faramotics_INCLUDE_DIRS}) ENDIF(faramotics_FOUND) - -if(${falkolib_FOUND}) +IF(falkolib_FOUND) + MESSAGE(STATUS "FALKO lib found:") + MESSAGE(STATUS " falkolib_INCLUDE_DIRS ${falkolib_INCLUDE_DIRS}") + MESSAGE(STATUS " falkolib_LIBRARY_DIRS ${falkolib_LIBRARY_DIRS}") + MESSAGE(STATUS " falkolib_LIBRARIES ${falkolib_LIBRARIES}") add_definitions(-DEIGEN_DISABLE_UNALIGNED_ARRAY_ASSERT) - include_directories(${falkolib_INCLUDE_DIRS}) - link_directories(${falkolib_LIBRARY_DIRS}) -endif() + INCLUDE_DIRECTORIES(${falkolib_INCLUDE_DIRS}) + LINK_DIRECTORIES(${falkolib_LIBRARY_DIRS}) +ENDIF(falkolib_FOUND) #headers SET(HDRS_BASE @@ -113,8 +110,6 @@ IF(falkolib_FOUND) target_link_libraries(${PROJECT_NAME} ${falkolib_LIBRARY}) ENDIF(falkolib_FOUND) - - # Examples IF(BUILD_DEMOS) MESSAGE("Building examples.")