Updated CMakeLists.txt for Windows builds

src/CMakeLists.txt

@@ -18,9 +18,23 @@ IF (WIN32)
 	add_definitions( -DNOMINMAX)
 
 	link_directories( ${Tesseract_DIR}/vs2008/LIB_Release/ )
+	
+	# Extra linker dependencies for Windows
+	SET(Tesseract_LIBS 		
+		libtesseract302-static
+		liblept168
+		liblept168-static-mtdll
+		libpng143-static-mtdll
+		libjpeg8c-static-mtdll
+		giflib416-static-mtdll
+		libtiff394-static-mtdll
+		zlib125-static-mtdll
+		ws2_32.lib)
 ELSE()
 
 	link_directories( ${Tesseract_DIR}/api/.libs/ )
+	
+	SET(Tesseract_LIBS tesseract)
 ENDIF()
 
 
@@ -38,33 +52,14 @@ set(CMAKE_CSS_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall ")
 ADD_EXECUTABLE( alpr  main.cpp  )
 
 
-IF (WIN32)
-	# Extra linker dependencies for Windows
-	TARGET_LINK_LIBRARIES(alpr
-		openalpr
+
+TARGET_LINK_LIBRARIES(alpr
+	openalpr-static
 	support
 	${OpenCV_LIBS}
-		libtesseract302-static
-		liblept168
-		liblept168-static-mtdll
-		libpng143-static-mtdll
-		libjpeg8c-static-mtdll
-		giflib416-static-mtdll
-		libtiff394-static-mtdll
-		zlib125-static-mtdll
-		ws2_32.lib
+	${Tesseract_LIBS}
   )
 
-ELSE()
-
-	TARGET_LINK_LIBRARIES(alpr
-		openalpr
-		support
-		${OpenCV_LIBS}
-		tesseract
-	  )
-ENDIF()
-
 add_subdirectory(openalpr)
 add_subdirectory(misc_utilities)
 

src/misc_utilities/CMakeLists.txt

@@ -5,27 +5,27 @@ target_link_libraries(openalpr)
 
 ADD_EXECUTABLE( sortstate  sortstate.cpp  )
 TARGET_LINK_LIBRARIES(sortstate 
-    openalpr
+    openalpr-static
     support
     ${OpenCV_LIBS} 
-    tesseract
+	${Tesseract_LIBS}
   )
   
 ADD_EXECUTABLE( classifychars  classifychars.cpp )
 TARGET_LINK_LIBRARIES(classifychars 
-    openalpr
+    openalpr-static
     support
     ${OpenCV_LIBS} 
-    tesseract
+	${Tesseract_LIBS}
   )
   
   
 ADD_EXECUTABLE( benchmark  benchmark.cpp )
 TARGET_LINK_LIBRARIES(benchmark 
-    openalpr
+    openalpr-static
     support
     ${OpenCV_LIBS} 
-    tesseract
+	${Tesseract_LIBS}
   )
   
   

src/openalpr/CMakeLists.txt

@@ -35,6 +35,11 @@ add_subdirectory(support)
 add_library(openalpr-static 	STATIC ${lpr_source_files} )
 add_library(openalpr 		SHARED ${lpr_source_files} )
 
+TARGET_LINK_LIBRARIES(openalpr
+	support
+	${OpenCV_LIBS}
+	${Tesseract_LIBS}
+  )
 
 # Add definition for default runtime dir
 add_definitions(-DDEFAULT_RUNTIME_DIR="${CMAKE_SOURCE_DIR}/../runtime_data/")