summaryrefslogtreecommitdiffstats
path: root/static
diff options
context:
space:
mode:
authorEd Tanous <ed.tanous@intel.com>2017-06-19 16:01:33 -0700
committerEd Tanous <ed.tanous@intel.com>2017-06-19 16:01:33 -0700
commit1e1e38cca13d42a133f68ce72a07b3ef5f2d3682 (patch)
tree7c482856aef30b853e6de5e4436c9f5ea79e5bc2 /static
parentdde86306fa561630a03980a6ccbd5950850eee91 (diff)
downloadbmcweb-1e1e38cca13d42a133f68ce72a07b3ef5f2d3682.tar.gz
bmcweb-1e1e38cca13d42a133f68ce72a07b3ef5f2d3682.zip
Make cssnano and uglifyjs optional
Diffstat (limited to 'static')
-rw-r--r--static/CMakeLists.txt13
1 files changed, 7 insertions, 6 deletions
diff --git a/static/CMakeLists.txt b/static/CMakeLists.txt
index c34487f..4c0ab32 100644
--- a/static/CMakeLists.txt
+++ b/static/CMakeLists.txt
@@ -69,6 +69,10 @@ set(OTHER_ASSETS
set(STATIC_ASSETS_OUT "")
set(MINIFIED_ASSETS_OUT "")
+find_program(CSS_MINIFIER uglifyjs)
+if(NOT UGLIFY_MINIFIER)
+ message("uglifyjs not found")
+endif()
foreach(JAVASCRIPT_ASSET ${JAVASCRIPT_ASSETS})
set(MINIFIED_FILENAME ${CMAKE_CURRENT_BINARY_DIR}/${JAVASCRIPT_ASSET})
@@ -83,14 +87,13 @@ foreach(JAVASCRIPT_ASSET ${JAVASCRIPT_ASSETS})
COMMENT "Minifying ${JAVASCRIPT_ASSET}"
)
-
list(APPEND MINIFIED_ASSETS_OUT ${MINIFIED_FILENAME})
# if it's a debug build, use the unminified version
- if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+ if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR NOT UGLIFY_MINIFIER)
list(APPEND STATIC_ASSETS_OUT ${CMAKE_CURRENT_SOURCE_DIR}/${JAVASCRIPT_ASSET})
else()
list(APPEND STATIC_ASSETS_OUT ${MINIFIED_FILENAME})
- endif (CMAKE_BUILD_TYPE STREQUAL "Debug")
+ endif (CMAKE_BUILD_TYPE STREQUAL "Debug" OR NOT UGLIFY_MINIFIER)
endforeach(JAVASCRIPT_ASSET)
@@ -103,9 +106,7 @@ foreach(CSS_ASSET ${CSS_ASSETS})
set(MINIFIED_FILENAME ${CMAKE_CURRENT_BINARY_DIR}/${CSS_ASSET})
get_filename_component(FOLDERNAME ${MINIFIED_FILENAME} DIRECTORY)
file(MAKE_DIRECTORY "${FOLDERNAME}")
- if(CSS_MINIFIER)
- message(FATAL_ERROR "cssnano not found!")
-
+ if(CSS_MINIFIER)
add_custom_command(OUTPUT ${MINIFIED_FILENAME}
COMMAND cssnano
"${CMAKE_CURRENT_SOURCE_DIR}/${CSS_ASSET}"
OpenPOWER on IntegriCloud