misc cmake cleanup

Josh Klontz
1 parent 4f47bb04
Showing 6 changed files with 45 additions and 42 deletions
CMakeLists.txt
app/CMakeLists.txt
openbr/CMakeLists.txt
openbr/plugins/cmake/eigen3.cmake
openbr/plugins/cmake/network.cmake
openbr/plugins/cmake/stasm4.cmake
@@ -142,7 +142,6 @@ endif()
 # Look for extensions to OpenBR
 set(BR_THIRDPARTY_PLUGINS_DIR CACHE PATH "")
 set(BR_THIRDPARTY_APPS_DIR CACHE PATH "")
-set(BR_THIRDPARTY_DIR CACHE PATH "")
 mark_as_advanced(BR_THIRDPARTY_PLUGINS_DIR)
 mark_as_advanced(BR_THIRDPARTY_APPS_DIR)
@@ -190,29 +189,29 @@ if(${BR_INSTALL_BRPY})
 endif()
 # Package
-if (NOT BR_PACKAGE_THIRDPARTY)
-set(CPACK_PACKAGE_EXECUTABLES "OpenBR" "OpenBR")
-set(CPACK_CREATE_DESKTOP_LINKS "OpenBR")
-if(CMAKE_HOST_WIN32)
-  set(CPACK_NSIS_MODIFY_PATH ON)
-  set(CPACK_NSIS_MUI_ICON ${NATIVE_ICON})
-  set(CPACK_NSIS_MUI_UNIICON ${NATIVE_ICON})
-  set(CPACK_NSIS_MENU_LINKS "doc/html/index.html" "Documentation")
-  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
+if(NOT ${BR_PACKAGE_THIRDPARTY})
+  set(CPACK_PACKAGE_EXECUTABLES "OpenBR" "OpenBR")
+  set(CPACK_CREATE_DESKTOP_LINKS "OpenBR")
+  if(CMAKE_HOST_WIN32)
+    set(CPACK_NSIS_MODIFY_PATH ON)
+    set(CPACK_NSIS_MUI_ICON ${NATIVE_ICON})
+    set(CPACK_NSIS_MUI_UNIICON ${NATIVE_ICON})
+    set(CPACK_NSIS_MENU_LINKS "doc/html/index.html" "Documentation")
+    if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+      set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
+    endif()
+    set(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\br-gui.exe")
+  elseif(CMAKE_HOST_APPLE)
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/README.md" "README.txt" COPYONLY)
+    set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
+    set(CPACK_BUNDLE_NAME ${CPACK_PACKAGE_NAME})
+    set(CPACK_BUNDLE_ICON ${NATIVE_ICON})
+    set(CPACK_BUNDLE_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
+    set(CPACK_BUNDLE_STARTUP_COMMAND ${BR_SHARE_DIR}/bundle.sh)
+    configure_file(${BR_SHARE_DIR}/Info.plist.in Info.plist)
+  else()
+    set(CPACK_DEBIAN_PACKAGE_MAINTAINER "josh.klontz@gmail.com")
   endif()
-  set(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\br-gui.exe")
-elseif(CMAKE_HOST_APPLE)
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/README.md" "README.txt" COPYONLY)
-  set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
-  set(CPACK_BUNDLE_NAME ${CPACK_PACKAGE_NAME})
-  set(CPACK_BUNDLE_ICON ${NATIVE_ICON})
-  set(CPACK_BUNDLE_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
-  set(CPACK_BUNDLE_STARTUP_COMMAND ${BR_SHARE_DIR}/bundle.sh)
-  configure_file(${BR_SHARE_DIR}/Info.plist.in Info.plist)
-else()
-  set(CPACK_DEBIAN_PACKAGE_MAINTAINER "josh.klontz@gmail.com")
-endif()
-include(CPack)
+  include(CPack)
 endif()
 # Build the command line interface
 add_subdirectory(br)
-if (NOT BR_PACKAGE_THIRDPARTY)
-# Build examples/tests
-add_subdirectory(examples)
+if(NOT BR_PACKAGE_THIRDPARTY)
+  if(NOT BR_EMBEDDED)
+    # Build examples/tests
+    add_subdirectory(examples)
-# Build additional OpenBR utilities
-if(NOT ${BR_EMBEDDED})
-  add_subdirectory(br-gui)
-endif()
+    # Build additional OpenBR utilities
+    add_subdirectory(br-gui)
+  endif()
 endif()
@@ -32,14 +32,14 @@ target_link_libraries(openbr ${BR_THIRDPARTY_LIBS})
 add_cppcheck(openbr)
 # Janus implementation
-set(BR_WITH_JANUS ON CACHE BOOL "Build IARPA Janus related applications.")
-if (BR_WITH_JANUS)
-set(JANUS_BUILD_PP5_WRAPPER ${BR_WITH_PP5} CACHE BOOL "Build Janus implementation using PittPatt 5")
-set(JANUS_BUILD_DOCS ${BR_BUILD_DOCUMENTATION} CACHE BOOL "Build Janus HTML Doxygen documentation")
-mark_as_advanced(JANUS_BUILD_PP5_WRAPPER)
-mark_as_advanced(JANUS_BUILD_DOCS)
-set(JANUS_IMPLEMENTATION openbr)
-add_subdirectory(janus)
+option(BR_WITH_JANUS "Build IARPA Janus related applications." ON)
+if(BR_WITH_JANUS)
+  set(JANUS_BUILD_PP5_WRAPPER ${BR_WITH_PP5} CACHE BOOL "Build Janus implementation using PittPatt 5")
+  set(JANUS_BUILD_DOCS ${BR_BUILD_DOCUMENTATION} CACHE BOOL "Build Janus HTML Doxygen documentation")
+  mark_as_advanced(JANUS_BUILD_PP5_WRAPPER)
+  mark_as_advanced(JANUS_BUILD_DOCS)
+  set(JANUS_IMPLEMENTATION openbr)
+  add_subdirectory(janus)
 endif()
 # Install
@@ -2,7 +2,9 @@ set(BR_WITH_EIGEN3 ON CACHE BOOL &quot;Build Eigen3 plugins&quot;)
 if(${BR_WITH_EIGEN3})
   find_package(Eigen3 REQUIRED)
-  install(FILES ${EIGEN3_LICENSE} RENAME Eigen3 DESTINATION share/openbr/licenses)
+  if(${BR_INSTALL_SHARE})
+    install(FILES ${EIGEN3_LICENSE} RENAME Eigen3 DESTINATION share/openbr/licenses)
+  endif()
 else()
   set(BR_EXCLUDED_PLUGINS ${BR_EXCLUDED_PLUGINS} plugins/classification/lda.cpp)
   set(BR_EXCLUDED_PLUGINS ${BR_EXCLUDED_PLUGINS} plugins/distance/L1.cpp)
@@ -4,7 +4,9 @@ if(${BR_WITH_QTNETWORK})
   find_package(HttpParser)
   set(QT_DEPENDENCIES ${QT_DEPENDENCIES} Network)
   set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} ${HTTPPARSER_SRC})
-  install(FILES ${HTTPPARSER_LICENSE} RENAME http-parser DESTINATION share/openbr/licenses)
+  if(${BR_INSTALL_SHARE})
+    install(FILES ${HTTPPARSER_LICENSE} RENAME http-parser DESTINATION share/openbr/licenses)
+  endif()
 else()
   set(BR_EXCLUDED_PLUGINS ${BR_EXCLUDED_PLUGINS} plugins/format/url.cpp)
   set(BR_EXCLUDED_PLUGINS ${BR_EXCLUDED_PLUGINS} plugins/format/post.cpp)
-set(BR_WITH_STASM4 ON CACHE BOOL "Build with Stasm")
+option(BR_WITH_STASM4 "Build with Stasm" ON)
 if(${BR_WITH_STASM4})
   find_package(Stasm4 REQUIRED)