Commit 88d2a073 authored by Langella Olivier's avatar Langella Olivier
Browse files

innosetup ok for windows, new windows icon

parent 287a2d3d
......@@ -14,6 +14,10 @@ cmake_minimum_required(VERSION 2.6)
PROJECT(masschroq CXX C)
set(CMAKE_COLOR_MAKEFILE ON)
set(CMAKE_VERBOSE_MAKEFILE ON)
if (MXE)
#x86_64-w64-mingw32.shared-cmake -DCMAKE_BUILD_TYPE=Release -DMXE=1 ..
#Could not find a package configuration file provided by "Qt5XmlPatterns"
......@@ -152,6 +156,21 @@ IF(CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo")
ENDIF( CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo" )
#############################################################
# We do not want warnings for unknown pragmas:
message(STATUS "Setting definition -Wno-unknown-pragmas.${ColourReset}")
add_definitions(-Wno-unknown-pragmas)
# Enable warnings and possibly treat them as errors
message(STATUS "${BoldGreen}Setting definition -Wall.${ColourReset}")
add_definitions(-Wall)
if(WARN_AS_ERROR)
message(STATUS "${BoldYellow}Setting definition -Werror.${ColourReset}")
add_definitions(-Werror)
endif()
message(STATUS "${BoldRed}CMAKE_SOURCE_DIR: ${CMAKE_SOURCE_DIR}${ColourReset}")
SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
SET(CPACK_GENERATOR "STGZ;TGZ;TZ")
......
......@@ -279,18 +279,20 @@ ELSE (NOGUI)
)
ENDIF (NOGUI)
IF (MINGW)
IF (MXE)
SET_TARGET_PROPERTIES(masschroq_main PROPERTIES LINK_FLAGS "-Wl,--subsystem,console ${CMAKE_EXE_LINKER_FLAGS}")
IF (NOGUI)
ELSE (NOGUI)
target_compile_options(
masschroq_gui PRIVATE -mwindows
)
SET_TARGET_PROPERTIES(masschroq_gui PROPERTIES LINK_FLAGS "-Wl,--subsystem,windows ${CMAKE_EXE_LINKER_FLAGS}")
target_compile_options(
masschroq_studio PRIVATE -mwindows
)
SET_TARGET_PROPERTIES(masschroq_studio PROPERTIES LINK_FLAGS "-Wl,--enable-auto-import -Wl,--subsystem,windows ${CMAKE_EXE_LINKER_FLAGS}")
ENDIF (NOGUI)
ELSE (MINGW)
ELSE (MXE)
#add new executable called new_parseur
#ADD_EXECUTABLE(new_parseur parseur.cpp)
......@@ -298,7 +300,7 @@ ELSE (MINGW)
INSTALL(TARGETS ${MASSCHROQ_LIB_NAME} LIBRARY DESTINATION lib)
ENDIF(MINGW)
ENDIF(MXE)
#if lib quanti is graphical
#TARGET_LINK_LIBRARIES(masschroq libmasschroq ${QT_LIBRARIES} ${Qwt5_Qt4_LIBRARY})
......@@ -53,16 +53,18 @@ Source: "z:/home/langella/developpement/git/pappsomspp/wbuild/src/pappsomspp/wid
Source: "{#sourceDir}\README"; DestDir: {app}; Flags: isreadme; Components: mcqComp
Source: "{#sourceDir}\COPYING"; DestDir: {app}; Flags: isreadme; Components: mcqComp
Source: "{#sourceDir}\win64\masschroq_icon.ico"; DestDir: {app}; Components: mcqComp
Source: "{#cmake_build_dir}\src\masschroq.exe"; DestDir: {app}; Components: mcqComp
Source: "{#cmake_build_dir}\src\masschroq_gui.exe"; DestDir: {app}; Components: mcqComp
Source: "{#cmake_build_dir}\src\masschroq_studio.exe"; DestDir: {app}; Components: mcqComp
[Icons]
Name: "{group}\masschroq"; Filename: "{app}\masschroq_gui.exe"; WorkingDir: "{app}"
Name: "{group}\masschroq_studio"; Filename: "{app}\masschroq_studio.exe"; WorkingDir: "{app}"
Name: "{group}\masschroq"; Filename: "{app}\masschroq_gui.exe"; WorkingDir: "{app}";IconFilename: "{app}\masschroq_icon.ico"
Name: "{group}\masschroq_studio"; Filename: "{app}\masschroq_studio.exe"; WorkingDir: "{app}";IconFilename: "{app}\masschroq_icon.ico"
Name: "{group}\Uninstall masschroq"; Filename: "{uninstallexe}"
[Types]
Name: "mcqType"; Description: "Full installation"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment