Fix win32 "filename.ico not found" error.
This commit is contained in:
parent
6474e203ea
commit
47e7d24f45
|
@ -14,6 +14,11 @@
|
||||||
#
|
#
|
||||||
# CMAKE_INSTALL_PREFIX (OPTIONAL)
|
# CMAKE_INSTALL_PREFIX (OPTIONAL)
|
||||||
#
|
#
|
||||||
|
# KICAD_MINIZIP ON/OFF
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# KICAD_PYTHON ON/OFF
|
||||||
|
#
|
||||||
#
|
#
|
||||||
|
|
||||||
# Our project is called 'kicad'. This is what it will be called in
|
# Our project is called 'kicad'. This is what it will be called in
|
||||||
|
@ -25,15 +30,13 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6 FATAL_ERROR)
|
||||||
# Path to local CMake modules
|
# Path to local CMake modules
|
||||||
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules)
|
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules)
|
||||||
|
|
||||||
# Command line option to enable or disable building minizip. Minizip
|
# Command line option to enable or disable building minizip. Minizip
|
||||||
# is building is enabled by defaut. Use -DKICAD_MINZIP=OFF to disable
|
# building is enabled by default. Use -DKICAD_MINZIP=OFF to disable
|
||||||
# building minizip.
|
# building minizip.
|
||||||
OPTION(KICAD_MINIZIP "enable/disable building minizip (default ON)" ON)
|
OPTION(KICAD_MINIZIP "enable/disable building minizip (default ON)" ON)
|
||||||
# Comment this out if you don't want to build minizip.
|
|
||||||
#SET(KICAD_MINIZIP ON CACHE BOOL "Build minizip?")
|
|
||||||
|
|
||||||
# Comment this out if you don't want to build with Python support.
|
# Comment this out if you don't want to build with Python support.
|
||||||
# SET(KICAD_PYTHON ON CACHE BOOL "Build with Python support?")
|
# OPTION(KICAD_PYTHON "enable/disable building with Python support (default OFF)")
|
||||||
|
|
||||||
# Set default flags for Release build.
|
# Set default flags for Release build.
|
||||||
SET(CMAKE_C_FLAGS_RELEASE "-Wall -O2 -DNDEBUG")
|
SET(CMAKE_C_FLAGS_RELEASE "-Wall -O2 -DNDEBUG")
|
||||||
|
|
|
@ -60,7 +60,7 @@ IF(WIN32)
|
||||||
IF(MINGW)
|
IF(MINGW)
|
||||||
# resource compilation for mingw (http://www.cmake.org/Bug/view.php?id=4068)
|
# resource compilation for mingw (http://www.cmake.org/Bug/view.php?id=4068)
|
||||||
ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cvpcb_rc.o
|
ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cvpcb_rc.o
|
||||||
COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR}} -I ${wxWidgets_ROOT_DIR}/include
|
COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${wxWidgets_ROOT_DIR}/include
|
||||||
-i ${CMAKE_CURRENT_SOURCE_DIR}/cvpcb.rc
|
-i ${CMAKE_CURRENT_SOURCE_DIR}/cvpcb.rc
|
||||||
-o ${CMAKE_CURRENT_BINARY_DIR}/cvpcb_rc.o)
|
-o ${CMAKE_CURRENT_BINARY_DIR}/cvpcb_rc.o)
|
||||||
SET(CVPCB_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/cvpcb_rc.o)
|
SET(CVPCB_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/cvpcb_rc.o)
|
||||||
|
|
|
@ -106,7 +106,7 @@ IF(WIN32)
|
||||||
IF(MINGW)
|
IF(MINGW)
|
||||||
# resource compilation for mingw (http://www.cmake.org/Bug/view.php?id=4068)
|
# resource compilation for mingw (http://www.cmake.org/Bug/view.php?id=4068)
|
||||||
ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/eeschema_rc.o
|
ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/eeschema_rc.o
|
||||||
COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR}} -I ${wxWidgets_ROOT_DIR}/include
|
COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${wxWidgets_ROOT_DIR}/include
|
||||||
-i ${CMAKE_CURRENT_SOURCE_DIR}/eeschema.rc
|
-i ${CMAKE_CURRENT_SOURCE_DIR}/eeschema.rc
|
||||||
-o ${CMAKE_CURRENT_BINARY_DIR}/eeschema_rc.o)
|
-o ${CMAKE_CURRENT_BINARY_DIR}/eeschema_rc.o)
|
||||||
SET(EESCHEMA_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/eeschema_rc.o)
|
SET(EESCHEMA_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/eeschema_rc.o)
|
||||||
|
|
|
@ -17,7 +17,7 @@ IF(WIN32)
|
||||||
IF(MINGW)
|
IF(MINGW)
|
||||||
# resource compilation for mingw (http://www.cmake.org/Bug/view.php?id=4068)
|
# resource compilation for mingw (http://www.cmake.org/Bug/view.php?id=4068)
|
||||||
ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kicad_rc.o
|
ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kicad_rc.o
|
||||||
COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR}} -I ${wxWidgets_ROOT_DIR}/include
|
COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${wxWidgets_ROOT_DIR}/include
|
||||||
-i ${CMAKE_CURRENT_SOURCE_DIR}/kicad.rc
|
-i ${CMAKE_CURRENT_SOURCE_DIR}/kicad.rc
|
||||||
-o ${CMAKE_CURRENT_BINARY_DIR}/kicad_rc.o)
|
-o ${CMAKE_CURRENT_BINARY_DIR}/kicad_rc.o)
|
||||||
SET(KICAD_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/kicad_rc.o)
|
SET(KICAD_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/kicad_rc.o)
|
||||||
|
|
|
@ -151,7 +151,7 @@ IF(WIN32)
|
||||||
IF(MINGW)
|
IF(MINGW)
|
||||||
# resource compilation for mingw (http://www.cmake.org/Bug/view.php?id=4068)
|
# resource compilation for mingw (http://www.cmake.org/Bug/view.php?id=4068)
|
||||||
ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pcbnew_rc.o
|
ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pcbnew_rc.o
|
||||||
COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR}} -I ${wxWidgets_ROOT_DIR}/include
|
COMMAND windres.exe -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${wxWidgets_ROOT_DIR}/include
|
||||||
-i ${CMAKE_CURRENT_SOURCE_DIR}/pcbnew.rc
|
-i ${CMAKE_CURRENT_SOURCE_DIR}/pcbnew.rc
|
||||||
-o ${CMAKE_CURRENT_BINARY_DIR}/pcbnew_rc.o)
|
-o ${CMAKE_CURRENT_BINARY_DIR}/pcbnew_rc.o)
|
||||||
SET(PCBNEW_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/pcbnew_rc.o)
|
SET(PCBNEW_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/pcbnew_rc.o)
|
||||||
|
|
Loading…
Reference in New Issue