Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thomas Pitiot
CGoGN
Commits
b83db656
Commit
b83db656
authored
Feb 20, 2015
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
windows compil lib in bin for easy dll loading
parent
cc1fed8b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
10 deletions
+16
-10
Apps/CMakeLists.txt
Apps/CMakeLists.txt
+2
-2
CMakeLists.txt
CMakeLists.txt
+14
-8
No files found.
Apps/CMakeLists.txt
View file @
b83db656
...
...
@@ -9,10 +9,10 @@ ENDIF ()
IF
(
WIN32
)
link_directories
(
${
CGoGN_ROOT_DIR
}
/windows_dependencies/lib/
)
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
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
ENDIF
()
ELSE
()
...
...
CMakeLists.txt
View file @
b83db656
...
...
@@ -44,8 +44,12 @@ setBuildType()
SET
(
EXECUTABLE_OUTPUT_PATH
${
CGoGN_ROOT_DIR
}
/bin/
)
IF
(
WIN32
AND
(
NOT CGoGN_WITH_QTCREATOR
))
SET
(
LIBRARY_OUTPUT_PATH
${
CGoGN_ROOT_DIR
}
/lib
)
IF
(
WIN32
)
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
()
SET
(
LIBRARY_OUTPUT_PATH
${
CGoGN_ROOT_DIR
}
/lib/
${
CMAKE_BUILD_TYPE
}
)
ENDIF
()
...
...
@@ -106,7 +110,8 @@ ENDIF ()
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
)
ENDIF
()
...
...
@@ -127,11 +132,12 @@ IF(NOT WIN32)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-unused-local-typedefs"
)
SET
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-Wno-unused-local-typedefs"
)
ENDIF
()
IF
(
APPLE
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-deprecated -Wno-overloaded-virtual"
)
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)
LIST
(
APPEND CGoGN_DEFS -DCGOGN_WITH_QT
)
LIST
(
APPEND CGoGN_EXT_INCLUDES
${
QT_INCLUDE_DIR
}
)
LIST
(
APPEND CGoGN_EXT_LIBS QGLViewer
${
QT_LIBRARIES
}
)
IF
(
NOT WIN32
)
#
IF (NOT WIN32)
LIST
(
APPEND CGoGN_EXT_INCLUDES
${
CGoGN_ROOT_DIR
}
/ThirdParty/libQGLViewer/
)
ENDIF
()
#
ENDIF()
ELSE
()
LIST
(
APPEND CGoGN_EXT_INCLUDES
${
IL_INCLUDE_DIR
}
)
LIST
(
APPEND CGoGN_EXT_LIBS
${
IL_LIBRARIES
}
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment