Commit b83db656 authored by Sylvain Thery's avatar Sylvain Thery

windows compil lib in bin for easy dll loading

parent cc1fed8b
...@@ -9,10 +9,10 @@ ENDIF () ...@@ -9,10 +9,10 @@ ENDIF ()
IF (WIN32) IF (WIN32)
link_directories( ${CGoGN_ROOT_DIR}/windows_dependencies/lib/) link_directories( ${CGoGN_ROOT_DIR}/windows_dependencies/lib/)
IF((CGoGN_WITH_QTCREATOR)) IF((CGoGN_WITH_QTCREATOR))
link_directories( ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE}) link_directories( ${CGoGN_ROOT_DIR}/bin/${CMAKE_BUILD_TYPE})
SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/${CMAKE_BUILD_TYPE}) # Release/Debug added automatically by visual SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/${CMAKE_BUILD_TYPE}) # Release/Debug added automatically by visual
ELSE() ELSE()
link_directories( ${CGoGN_ROOT_DIR}/lib/${ConfigurationName}) link_directories( ${CGoGN_ROOT_DIR}/bin/${ConfigurationName})
SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/) # Release/Debug added automatically by visual SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/) # Release/Debug added automatically by visual
ENDIF() ENDIF()
ELSE() ELSE()
......
...@@ -44,8 +44,12 @@ setBuildType() ...@@ -44,8 +44,12 @@ setBuildType()
SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/) SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/)
IF(WIN32 AND (NOT CGoGN_WITH_QTCREATOR)) IF(WIN32)
SET(LIBRARY_OUTPUT_PATH ${CGoGN_ROOT_DIR}/lib) IF (NOT CGoGN_WITH_QTCREATOR)
SET(LIBRARY_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/)
ELSE()
SET(LIBRARY_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/${CMAKE_BUILD_TYPE})
ENDIF()
ELSE() ELSE()
SET(LIBRARY_OUTPUT_PATH ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE}) SET(LIBRARY_OUTPUT_PATH ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE})
ENDIF() ENDIF()
...@@ -106,7 +110,8 @@ ENDIF () ...@@ -106,7 +110,8 @@ ENDIF ()
ADD_SUBDIRECTORY(ThirdParty/TinyXml2) ADD_SUBDIRECTORY(ThirdParty/TinyXml2)
IF (CGoGN_WITH_QT AND (NOT WIN32)) #IF (CGoGN_WITH_QT AND (NOT WIN32))
IF (CGoGN_WITH_QT)
ADD_SUBDIRECTORY(ThirdParty/libQGLViewer/QGLViewer) ADD_SUBDIRECTORY(ThirdParty/libQGLViewer/QGLViewer)
ENDIF() ENDIF()
...@@ -127,11 +132,12 @@ IF(NOT WIN32) ...@@ -127,11 +132,12 @@ IF(NOT WIN32)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-local-typedefs") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-local-typedefs")
ENDIF() ENDIF()
IF(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-overloaded-virtual")
ENDIF()
ENDIF() ENDIF()
if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-overloaded-virtual")
endif()
# #
...@@ -180,9 +186,9 @@ IF (CGoGN_WITH_QT) ...@@ -180,9 +186,9 @@ IF (CGoGN_WITH_QT)
LIST(APPEND CGoGN_DEFS -DCGOGN_WITH_QT) LIST(APPEND CGoGN_DEFS -DCGOGN_WITH_QT)
LIST(APPEND CGoGN_EXT_INCLUDES ${QT_INCLUDE_DIR}) LIST(APPEND CGoGN_EXT_INCLUDES ${QT_INCLUDE_DIR})
LIST(APPEND CGoGN_EXT_LIBS QGLViewer ${QT_LIBRARIES}) LIST(APPEND CGoGN_EXT_LIBS QGLViewer ${QT_LIBRARIES})
IF (NOT WIN32) # IF (NOT WIN32)
LIST(APPEND CGoGN_EXT_INCLUDES ${CGoGN_ROOT_DIR}/ThirdParty/libQGLViewer/) LIST(APPEND CGoGN_EXT_INCLUDES ${CGoGN_ROOT_DIR}/ThirdParty/libQGLViewer/)
ENDIF() # ENDIF()
ELSE () ELSE ()
LIST(APPEND CGoGN_EXT_INCLUDES ${IL_INCLUDE_DIR}) LIST(APPEND CGoGN_EXT_INCLUDES ${IL_INCLUDE_DIR})
LIST(APPEND CGoGN_EXT_LIBS ${IL_LIBRARIES}) LIST(APPEND CGoGN_EXT_LIBS ${IL_LIBRARIES})
......
Markdown is supported
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