Merge pull request #5437 from NlightNFotis/fix/cmakelists_flexbison_required

NlightNFotis · web-flow · commit c82dabae234b · 2020-07-31T10:44:49.000+01:00
Fix CMake build on Windows
diff --git a/jbmc/CMakeLists.txt b/jbmc/CMakeLists.txt
@@ -4,7 +4,7 @@ add_subdirectory(unit)
 
 add_custom_target(java-models-library ALL
     COMMAND mvn --quiet -Dmaven.test.skip=true package
-    COMMAND cp target/core-models.jar ${CMAKE_CURRENT_SOURCE_DIR}/src/java_bytecode/library/
+    COMMAND ${CMAKE_COMMAND} -E copy target/core-models.jar ${CMAKE_CURRENT_SOURCE_DIR}/src/java_bytecode/library/
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/java-models-library
 )
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 project(CBMC)
 
-find_package(BISON)
-find_package(FLEX)
+find_package(BISON REQUIRED)
+find_package(FLEX REQUIRED)
 
 find_package(Doxygen)
 if(DOXYGEN_FOUND)

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ add_subdirectory(unit)`
`4`	`4`
`5`	`5`	`add_custom_target(java-models-library ALL`
`6`	`6`	`COMMAND mvn --quiet -Dmaven.test.skip=true package`
`7`		`- COMMAND cp target/core-models.jar ${CMAKE_CURRENT_SOURCE_DIR}/src/java_bytecode/library/`
	`7`	`+ COMMAND ${CMAKE_COMMAND} -E copy target/core-models.jar ${CMAKE_CURRENT_SOURCE_DIR}/src/java_bytecode/library/`
`8`	`8`	`WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/java-models-library`
`9`	`9`	`)`
`10`	`10`